changeset in /hg/icedtea6: * .hgignore: Added cacao.
Christian Thalinger
twisti at complang.tuwien.ac.at
Thu Jun 26 06:20:11 PDT 2008
changeset 395d2515deeb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=395d2515deeb
description:
* .hgignore: Added cacao.
* Makefile.am (CACAO_VERSION, CACAO_MD5SUM, CACAO_URL, CACAO_SRC_ZIP):
New variables.
(distclean-local): Removed cacao directory.
[WITH_CACAO] (ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Use WITH_CACAO instead of
CACAO.
(stamps/download.stamp) [WITH_CACAO && !USE_SYSTEM_CACAO]: Download
CACAO tarball.
(clean-download): Removed CACAO tarball.
(stamps/extract.stamp) [WITH_CACAO && !USE_SYSTEM_CACAO]: Extract
CACAO tarball.
(stamps/cacao.stamp): New target.
(cacao): Likewise.
* Makefile.in: Regenerated.
* acinclude.m4 (AC_CHECK_WITH_CACAO): Renamed CACAO to WITH_CACAO.
(AC_CHECK_WITH_CACAO_HOME): New function.
(AC_CHECK_WITH_CACAO_SRC_ZIP): Likewise.
* aclocal.m4: Regenerated.
* configure: Likewise.
* configure.ac (AC_CHECK_WITH_CACAO_HOME): Added.
(AC_CHECK_WITH_CACAO_SRC_ZIP): Likewise.
diffstat:
7 files changed, 389 insertions(+), 113 deletions(-)
.hgignore | 1
Makefile.am | 75 +++++++++++++++++--
Makefile.in | 72 +++++++++++++-----
acinclude.m4 | 76 +++++++++++++------
aclocal.m4 | 50 +++++-------
configure | 226 ++++++++++++++++++++++++++++++++++++++++++++++++----------
configure.ac | 2
diffs (truncated from 971 to 500 lines):
diff -r 6e00d6062f4f -r 395d2515deeb .hgignore
--- a/.hgignore Thu Jun 26 01:03:13 2008 +0100
+++ b/.hgignore Thu Jun 26 14:59:01 2008 +0200
@@ -3,6 +3,7 @@ syntax: glob
syntax: regexp
autom4te.cache
+cacao
openjdk
bootstrap
debian
diff -r 6e00d6062f4f -r 395d2515deeb Makefile.am
--- a/Makefile.am Thu Jun 26 01:03:13 2008 +0100
+++ b/Makefile.am Thu Jun 26 14:59:01 2008 +0200
@@ -1,6 +1,9 @@ OPENJDK_DATE = 30_may_2008
OPENJDK_DATE = 30_may_2008
OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
OPENJDK_VERSION = b10
+
+CACAO_VERSION = 0.99.1
+CACAO_MD5SUM = 2337754d0c165af556e97395e9a5e5af
JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
@@ -20,6 +23,7 @@ distclean-local: clean-copy clean-jtreg
rm -rf openjdk-ecj
rm -rf openjdk
rm -rf hotspot-tools
+ rm -rf cacao
rm -f gcjwebplugin.so
install:
@@ -115,7 +119,7 @@ ICEDTEA_ENV = \
if WITH_CACAO
ICEDTEA_ENV += \
- "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
endif
if !ENABLE_OPTIMIZATIONS
@@ -185,7 +189,7 @@ ICEDTEA_ENV_ECJ = \
if WITH_CACAO
ICEDTEA_ENV_ECJ += \
- "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
endif
if !ENABLE_OPTIMIZATIONS
@@ -218,6 +222,15 @@ else
else
OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
endif
+
+CACAO_URL = http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-$(CACAO_VERSION)/
+
+if USE_ALT_CACAO_SRC_ZIP
+ CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
+else
+ CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
+endif
+
stamps/download.stamp:
if USE_ALT_OPENJDK_SRC_ZIP
@@ -232,12 +245,28 @@ else
$(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
fi
endif
+if WITH_CACAO
+if !USE_SYSTEM_CACAO
+ if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then \
+ if [ $(CACAO_SRC_ZIP) ] ; \
+ then \
+ mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
+ fi ; \
+ $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
+ fi
+endif
+endif
mkdir -p stamps
touch stamps/download.stamp
clean-download:
rm -f stamps/download.stamp
rm -f $(OPENJDK_SRC_ZIP)
+if WITH_CACAO
+ rm -f $(CACAO_SRC_ZIP)
+endif
# Link ports sources into tree
stamps/ports.stamp: stamps/extract.stamp
@@ -248,11 +277,11 @@ stamps/ports.stamp: stamps/extract.stamp
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
@@ -373,6 +402,15 @@ stamps/extract.stamp: stamps/download.st
rm -rf $(JSCHEME_DIR)/lib; \
rm -rf $(JSCHEME_DIR)/scripts; \
fi
+if WITH_CACAO
+if !USE_SYSTEM_CACAO
+ if ! test -d cacao ; \
+ then \
+ mkdir cacao ; \
+ $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
+ fi
+endif
+endif
mkdir -p stamps
touch stamps/extract.stamp
@@ -447,11 +485,11 @@ stamps/ports-ecj.stamp: stamps/extract-e
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
@@ -627,7 +665,7 @@ icedtea: stamps/bootstrap-directory-syml
icedtea: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- gcjwebplugin.so extra-lib/about.jar
+ gcjwebplugin.so extra-lib/about.jar stamps/cacao.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make/ \
@@ -650,7 +688,7 @@ icedtea-debug: stamps/bootstrap-director
icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- gcjwebplugin.so extra-lib/about.jar
+ gcjwebplugin.so extra-lib/about.jar stamps/cacao.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
@@ -945,6 +983,25 @@ extra-lib/about.jar: stamps/extra-class-
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
fi
+
+stamps/cacao.stamp:
+if !USE_SYSTEM_CACAO
+ cd cacao/cacao-$(CACAO_VERSION) ; \
+ ./configure \
+ --prefix=$(abs_top_srcdir)/cacao/install \
+ --with-java-runtime-library=openjdk \
+ --with-java-runtime-library-prefix=$(abs_top_srcdir)/openjdk \
+ --with-java-runtime-library-classes=$(abs_top_srcdir)/lib/rt \
+ --enable-jre-layout ; \
+ make install
+endif
+ mkdir -p stamps
+ touch $@
+
+clean-cacao:
+ rm -rf cacao
+ rm -f stamps/cacao.stamp
+
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
if test "$(ENABLE_PLUGIN)" == "yes" ; \
@@ -1019,6 +1076,8 @@ bootstrap-directory-symlink-ecj: stamps/
bootstrap-directory-symlink: stamps/bootstrap-directory-symlink.stamp
+cacao: stamps/cacao.stamp
+
copy-source-files: stamps/copy-source-files.stamp
download: stamps/download.stamp
diff -r 6e00d6062f4f -r 395d2515deeb Makefile.in
--- a/Makefile.in Thu Jun 26 01:03:13 2008 +0100
+++ b/Makefile.in Thu Jun 26 14:59:01 2008 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -32,7 +32,7 @@ build_triplet = @build@
build_triplet = @build@
host_triplet = @host@
@WITH_CACAO_TRUE at am__append_1 = \
- at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+ at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
@ENABLE_OPTIMIZATIONS_FALSE at am__append_2 = \
@ENABLE_OPTIMIZATIONS_FALSE@ "NO_OPTIMIZATIONS=true" \
@@ -42,7 +42,7 @@ host_triplet = @host@
@ENABLE_DOCS_FALSE@ "NO_DOCS=true"
@WITH_CACAO_TRUE at am__append_4 = \
- at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)"
+ at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
@ENABLE_OPTIMIZATIONS_FALSE at am__append_5 = \
@ENABLE_OPTIMIZATIONS_FALSE@ "NO_OPTIMIZATIONS=true" \
@@ -89,6 +89,7 @@ ACLOCAL = @ACLOCAL@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@
ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
AMTAR = @AMTAR@
ANT = @ANT@
@@ -97,7 +98,7 @@ AUTOMAKE = @AUTOMAKE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
-CACAO = @CACAO@
+CACAO_IMPORT_PATH = @CACAO_IMPORT_PATH@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -186,6 +187,7 @@ UNZIP = @UNZIP@
UNZIP = @UNZIP@
VERSION = @VERSION@
WGET = @WGET@
+WITH_CACAO = @WITH_CACAO@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XALAN2_JAR = @XALAN2_JAR@
@@ -261,6 +263,8 @@ OPENJDK_DATE = 30_may_2008
OPENJDK_DATE = 30_may_2008
OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
OPENJDK_VERSION = b10
+CACAO_VERSION = 0.99.1
+CACAO_MD5SUM = 2337754d0c165af556e97395e9a5e5af
JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc tools-copy contrib ports \
@@ -383,6 +387,9 @@ OPENJDK_URL = http://download.java.net/o
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
@USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
@USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
+CACAO_URL = http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-$(CACAO_VERSION)/
+ at USE_ALT_CACAO_SRC_ZIP_FALSE@CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
+ at USE_ALT_CACAO_SRC_ZIP_TRUE@CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
@GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
# If new gcc is installed, apply 4.3 patch
@@ -595,10 +602,6 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -625,8 +628,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -772,7 +773,7 @@ uninstall-am:
.PHONY: all all-am all-local am--refresh check check-am check-local \
clean clean-generic dist dist-all dist-bzip2 dist-gzip \
- dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-local distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
@@ -800,6 +801,7 @@ distclean-local: clean-copy clean-jtreg
rm -rf openjdk-ecj
rm -rf openjdk
rm -rf hotspot-tools
+ rm -rf cacao
rm -f gcjwebplugin.so
install:
@@ -836,12 +838,22 @@ stamps/download.stamp:
@USE_ALT_OPENJDK_SRC_ZIP_FALSE@ fi ; \
@USE_ALT_OPENJDK_SRC_ZIP_FALSE@ $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
@USE_ALT_OPENJDK_SRC_ZIP_FALSE@ fi
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ | $(MD5SUM) --check ; \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if [ $(CACAO_SRC_ZIP) ] ; \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi ; \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi
mkdir -p stamps
touch stamps/download.stamp
clean-download:
rm -f stamps/download.stamp
rm -f $(OPENJDK_SRC_ZIP)
+ at WITH_CACAO_TRUE@ rm -f $(CACAO_SRC_ZIP)
# Link ports sources into tree
stamps/ports.stamp: stamps/extract.stamp
@@ -852,11 +864,11 @@ stamps/ports.stamp: stamps/extract.stamp
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
@@ -871,6 +883,11 @@ stamps/extract.stamp: stamps/download.st
rm -rf $(JSCHEME_DIR)/lib; \
rm -rf $(JSCHEME_DIR)/scripts; \
fi
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ mkdir cacao ; \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
+ at USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ fi
mkdir -p stamps
touch stamps/extract.stamp
@@ -944,11 +961,11 @@ stamps/ports-ecj.stamp: stamps/extract-e
ln -sf $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
+ if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
fi
mkdir -p stamps
@@ -1086,7 +1103,7 @@ icedtea: stamps/bootstrap-directory-syml
icedtea: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- gcjwebplugin.so extra-lib/about.jar
+ gcjwebplugin.so extra-lib/about.jar stamps/cacao.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make/ \
@@ -1109,7 +1126,7 @@ icedtea-debug: stamps/bootstrap-director
icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
- gcjwebplugin.so extra-lib/about.jar
+ gcjwebplugin.so extra-lib/about.jar stamps/cacao.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make \
@@ -1379,6 +1396,23 @@ extra-lib/about.jar: stamps/extra-class-
else \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
fi
+
+stamps/cacao.stamp:
+ at USE_SYSTEM_CACAO_FALSE@ cd cacao/cacao-$(CACAO_VERSION) ; \
+ at USE_SYSTEM_CACAO_FALSE@ ./configure \
+ at USE_SYSTEM_CACAO_FALSE@ --prefix=$(abs_top_srcdir)/cacao/install \
+ at USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library=openjdk \
+ at USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library-prefix=$(abs_top_srcdir)/openjdk \
+ at USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library-classes=$(abs_top_srcdir)/lib/rt \
+ at USE_SYSTEM_CACAO_FALSE@ --enable-jre-layout ; \
+ at USE_SYSTEM_CACAO_FALSE@ make install
+ mkdir -p stamps
+ touch $@
+
+clean-cacao:
+ rm -rf cacao
+ rm -f stamps/cacao.stamp
+
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
if test "$(ENABLE_PLUGIN)" == "yes" ; \
@@ -1453,6 +1487,8 @@ bootstrap-directory-symlink-ecj: stamps/
bootstrap-directory-symlink: stamps/bootstrap-directory-symlink.stamp
+cacao: stamps/cacao.stamp
+
copy-source-files: stamps/copy-source-files.stamp
download: stamps/download.stamp
diff -r 6e00d6062f4f -r 395d2515deeb acinclude.m4
--- a/acinclude.m4 Thu Jun 26 01:03:13 2008 +0100
+++ b/acinclude.m4 Thu Jun 26 14:59:01 2008 +0200
@@ -698,25 +698,57 @@ AC_DEFUN([AC_CHECK_WITH_CACAO],
[
AC_MSG_CHECKING(whether to use CACAO as VM)
AC_ARG_WITH([cacao],
- [AS_HELP_STRING(--with-cacao,use CACAO as VM)],
- [
- case "${withval}" in
- yes)
- CACAO=/usr/local/cacao
- ;;
- no)
- CACAO=no
- ;;
- *)
- CACAO=${withval}
- ;;
- esac
- ],
- [
- CACAO=no
- ])
-
- AC_MSG_RESULT(${CACAO})
- AM_CONDITIONAL(WITH_CACAO, test x"${CACAO}" != "xno")
- AC_SUBST(CACAO)
-])
+ [AS_HELP_STRING(--with-cacao,use CACAO as VM [[default=no]])],
+ [
+ WITH_CACAO=yes
+ ],
+ [
+ WITH_CACAO=no
+ ])
+
+ AC_MSG_RESULT(${WITH_CACAO})
+ AM_CONDITIONAL(WITH_CACAO, test x"${WITH_CACAO}" = "xyes")
+ AC_SUBST(WITH_CACAO)
+])
+
+AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
+[
+ AC_MSG_CHECKING(CACAO home directory)
+ AC_ARG_WITH([cacao-home],
+ [AS_HELP_STRING([--with-cacao-home],
+ [CACAO home directory [[default=/usr/local/cacao]]])],
+ [
+ case "${withval}" in
+ yes)
+ CACAO_IMPORT_PATH=/usr/local/cacao
+ ;;
+ *)
+ CACAO_IMPORT_PATH=${withval}
+ ;;
+ esac
+ AM_CONDITIONAL(USE_SYSTEM_CACAO, true)
+ ],
+ [
+ CACAO_IMPORT_PATH="\$(abs_top_srcdir)/cacao/install"
+ AM_CONDITIONAL(USE_SYSTEM_CACAO, false)
+ ])
+ AC_MSG_RESULT(${CACAO_IMPORT_PATH})
+ AC_SUBST(CACAO_IMPORT_PATH)
+])
+
+AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP],
+[
+ AC_MSG_CHECKING(CACAO source zip)
+ AC_ARG_WITH([cacao-src-zip],
+ [AS_HELP_STRING(--with-cacao-src-zip,specify the location of the CACAO source zip)],
+ [
+ ALT_CACAO_SRC_ZIP=${withval}
+ AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test x = x)
+ ],
+ [
+ ALT_CACAO_SRC_ZIP="not specified"
+ AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test x != x)
+ ])
+ AC_MSG_RESULT(${ALT_CACAO_SRC_ZIP})
More information about the distro-pkg-dev
mailing list