/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue May 5 04:45:17 UTC 2015
changeset 57592c0e9b8b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=57592c0e9b8b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 10 20:27:28 2015 +0000
PR1289: Allow JARs to be optionally compressed by setting COMPRESS_JARS
2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1289: Allow JARs to be optionally compressed by
setting COMPRESS_JARS
* Makefile.am:
(ICEDTEA_ENV): Add COMPRESS_JARS="true" if
ENABLE_JAR_COMPRESSION is set.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_JAR_COMPRESSION): Added.
* configure.ac: Include new macro.
changeset dc6a63fd4529 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dc6a63fd4529
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 30 04:33:46 2011 +0100
PR1277: Use tar.gz rather than tar.bz2 for bundle as with IcedTea6.
2010-11-11 Stefan Ring <stefan at complang.tuwien.ac.at>
* Makefile.am: Upgrade CACAO version,
use .tar.gz archive
changeset fe2a53d5ac78 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fe2a53d5ac78
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue May 05 05:07:32 2015 +0100
PR1277: Synchronise CACAO rules between IcedTea6/7/8 where possible
2013-06-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1276: Synchronise CACAO rules between IcedTea6/7/8
where possible
* NEWS: Updated.
2011-02-23 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(IT_WITH_CACAO_SRC_DIR): Renamed from
IT_CHECK_WITH_CACAO_SRC_DIR.
* configure.ac: Synchronise naming.
2011-02-21 Andrew John Hughes <ahughes at redhat.com>
Ensure all our macros have an IT_ prefix.
* acinclude.m4:
(IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from
AC_CHECK_WITH_CACAO_SRC_DIR.
* configure.ac: Synchronise naming.
2010-01-16 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking
output.
2009-10-01 Robert Schuster <robertschuster at fsfe.org>
* configure.ac: Added --with-cacao-src-dir option.
* acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR.
* Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used.
changeset 9b41af4e0b30 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9b41af4e0b30
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue May 05 05:14:23 2015 +0100
PR2329: jamvm parallel unpack failures
2013-02-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: List PR1295.
* Makefile.am:
(extract-jamvm): Depend on download-jamvm.
changeset 8161faa0fe16 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8161faa0fe16
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue May 05 05:21:07 2015 +0100
PR1277: Get CACAO at least as far as the failing ./configure.
2011-10-19 Andrew John Hughes <ahughes at redhat.com>
* patches/cacao/6714758.patch:
Removed; upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Drop above patch.
(extract-cacao): Use gzip not bzip2.
(extract-jamvm): Explicitly use gzip.
diffstat:
ChangeLog | 64 +++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 25 ++++++++++++++---
NEWS | 3 ++
acinclude.m4 | 39 +++++++++++++++++++++++++++
configure.ac | 2 +
patches/cacao/6714758.patch | 40 ----------------------------
6 files changed, 128 insertions(+), 45 deletions(-)
diffs (298 lines):
diff -r 6d2ddb408564 -r 8161faa0fe16 ChangeLog
--- a/ChangeLog Wed Mar 04 17:31:04 2015 +0000
+++ b/ChangeLog Tue May 05 05:21:07 2015 +0100
@@ -1,3 +1,67 @@
+2011-10-19 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/cacao/6714758.patch:
+ Removed; upstream.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop above patch.
+ (extract-cacao): Use gzip not bzip2.
+ (extract-jamvm): Explicitly use gzip.
+
+2013-02-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (extract-jamvm): Depend on download-jamvm.
+
+2013-06-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1277: Synchronise CACAO rules between IcedTea6/7/8
+ where possible
+ * NEWS: Updated.
+
+2011-02-23 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_WITH_CACAO_SRC_DIR): Renamed from
+ IT_CHECK_WITH_CACAO_SRC_DIR.
+ * configure.ac: Synchronise naming.
+
+2011-02-21 Andrew John Hughes <ahughes at redhat.com>
+
+ Ensure all our macros have an IT_ prefix.
+ * acinclude.m4:
+ (IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from
+ AC_CHECK_WITH_CACAO_SRC_DIR.
+ * configure.ac: Synchronise naming.
+
+2010-01-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking
+ output.
+
+2009-10-01 Robert Schuster <robertschuster at fsfe.org>
+
+ * configure.ac: Added --with-cacao-src-dir option.
+ * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR.
+ * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used.
+
+2010-11-11 Stefan Ring <stefan at complang.tuwien.ac.at>
+
+ * Makefile.am: Upgrade CACAO version,
+ use .tar.gz archive
+
+2012-08-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1289: Allow JARs to be optionally compressed by
+ setting COMPRESS_JARS
+ * Makefile.am:
+ (ICEDTEA_ENV): Add COMPRESS_JARS="true" if
+ ENABLE_JAR_COMPRESSION is set.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_JAR_COMPRESSION): Added.
+ * configure.ac: Include new macro.
+
2013-06-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 6d2ddb408564 -r 8161faa0fe16 Makefile.am
--- a/Makefile.am Wed Mar 04 17:31:04 2015 +0000
+++ b/Makefile.am Tue May 05 05:21:07 2015 +0100
@@ -31,7 +31,7 @@
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
CACAO_BASE_URL = $(DROP_URL)/cacao
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
-CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
JAMVM_VERSION = ec18fb9e49e62dce16c5094ef1527eed619463aa
JAMVM_SHA256SUM = 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc
@@ -223,7 +223,6 @@
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
- patches/cacao/6714758.patch \
patches/cacao/memory.patch
endif
@@ -368,6 +367,11 @@
# ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
# ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)"
+if ENABLE_JAR_COMPRESSION
+ICEDTEA_ENV += \
+ COMPRESS_JARS="true"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_CONFIGURE_BOOT = $(ICEDTEA_CONFIGURE)
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
@@ -739,6 +743,8 @@
stamps/download-cacao.stamp:
if BUILD_CACAO
if !USE_SYSTEM_CACAO
+if USE_ALT_CACAO_SRC_DIR
+else
if USE_ALT_CACAO_SRC_ZIP
ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
endif
@@ -760,6 +766,7 @@
fi
endif
endif
+endif
mkdir -p stamps
touch $@
@@ -1044,11 +1051,18 @@
stamps/extract-cacao.stamp: stamps/download-cacao.stamp
if BUILD_CACAO
if !USE_SYSTEM_CACAO
+if USE_ALT_CACAO_SRC_DIR
+ if ! test -d cacao ; \
+ then \
+ mkdir -p cacao/cacao ; \
+ cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
+ fi
+else
set -e ; \
if ! test -d cacao/cacao ; \
then \
mkdir cacao ; \
- $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \
+ $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
dir=$$(basename cacao/cacao-*) ; \
ln -s $$dir cacao/cacao ; \
cd cacao/cacao ; \
@@ -1056,19 +1070,20 @@
fi
endif
endif
+endif
mkdir -p stamps
touch $@
clean-extract-cacao: clean-cacao
rm -f stamps/extract-cacao.stamp
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
if BUILD_JAMVM
set -e ; \
if ! test -d jamvm ; \
then \
mkdir jamvm ; \
- $(TAR) xf $(JAMVM_SRC_ZIP) -C jamvm ; \
+ $(TAR) xzf $(JAMVM_SRC_ZIP) -C jamvm ; \
dir=$$(basename jamvm/jamvm-*) ; \
ln -s $$dir jamvm/jamvm ; \
fi
diff -r 6d2ddb408564 -r 8161faa0fe16 NEWS
--- a/NEWS Wed Mar 04 17:31:04 2015 +0000
+++ b/NEWS Tue May 05 05:21:07 2015 +0100
@@ -25,8 +25,10 @@
- S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
- PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops
- PR1275: Provide option to turn off downloading of tarballs
+ - PR1277: Synchronise CACAO rules between IcedTea6/7/8 where possible
- PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible
- PR1281, RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
+ - PR1289: Allow JARs to be optionally compressed by setting COMPRESS_JARS
- PR1291: Ensure unlimited crypto policy is in place.
- PR1325: Only add classes to rt-source-files.txt if actually needed
- PR1346: Filter out -j option to make
@@ -57,6 +59,7 @@
- PR2248: HotSpot tarball fails verification after download
- PR2256: Add SystemTap tests
- PR2257: clean-extract-nashorn rule is never run
+ - PR2329: jamvm parallel unpack failures
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
diff -r 6d2ddb408564 -r 8161faa0fe16 acinclude.m4
--- a/acinclude.m4 Wed Mar 04 17:31:04 2015 +0000
+++ b/acinclude.m4 Tue May 05 05:21:07 2015 +0100
@@ -820,6 +820,23 @@
AC_SUBST(ALT_CACAO_SRC_ZIP)
])
+AC_DEFUN([IT_WITH_CACAO_SRC_DIR],
+[
+ AC_MSG_CHECKING([for a CACAO source directory])
+ AC_ARG_WITH([cacao-src-dir],
+ [AS_HELP_STRING(--with-cacao-src-dir,specify the location of the Cacao sources)],
+ [
+ ALT_CACAO_SRC_DIR=${withval}
+ AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x = x)
+ ],
+ [
+ ALT_CACAO_SRC_DIR="not specified"
+ AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x != x)
+ ])
+ AC_MSG_RESULT(${ALT_CACAO_SRC_DIR})
+ AC_SUBST(ALT_CACAO_SRC_DIR)
+])
+
AC_DEFUN([IT_ENABLE_HG],
[
AC_MSG_CHECKING(whether to retrieve the source code from Mercurial)
@@ -1980,3 +1997,25 @@
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
+
+AC_DEFUN([IT_ENABLE_JAR_COMPRESSION],
+[
+ AC_MSG_CHECKING([whether to enable JAR compression])
+ AC_ARG_ENABLE([jar-compression],
+ [AS_HELP_STRING(--enable-jar-compression,compress built jars [[default=yes]])],
+ [
+ case "${enableval}" in
+ no)
+ enable_jar_compression=no
+ ;;
+ *)
+ enable_jar_compression=yes
+ ;;
+ esac
+ ],
+ [
+ enable_jar_compression=yes
+ ])
+ AC_MSG_RESULT([$enable_jar_compression])
+ AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xyes")
+])
diff -r 6d2ddb408564 -r 8161faa0fe16 configure.ac
--- a/configure.ac Wed Mar 04 17:31:04 2015 +0000
+++ b/configure.ac Tue May 05 05:21:07 2015 +0100
@@ -133,10 +133,12 @@
IT_ENABLE_CACAO
IT_WITH_CACAO_HOME
IT_WITH_CACAO_SRC_ZIP
+IT_WITH_CACAO_SRC_DIR
IT_ENABLE_JAMVM
IT_WITH_JAMVM_SRC_ZIP
IT_DISABLE_OPTIMIZATIONS
+IT_ENABLE_JAR_COMPRESSION
IT_SET_SHARK_BUILD
IT_ENABLE_ZERO_BUILD
IT_CHECK_ADDITIONAL_VMS
diff -r 6d2ddb408564 -r 8161faa0fe16 patches/cacao/6714758.patch
--- a/patches/cacao/6714758.patch Wed Mar 04 17:31:04 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-diff -Nru cacao.orig/cacaog/contrib/mapfile-vers-product cacao/cacao-8948a434c10d/contrib/mapfile-vers-product
---- cacao.orig/cacao/contrib/mapfile-vers-product 2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao/contrib/mapfile-vers-product 2010-06-21 20:08:28.000000000 +0100
-@@ -86,6 +86,7 @@
- JVM_EnableCompiler;
- JVM_Exit;
- JVM_FillInStackTrace;
-+ JVM_FindClassFromBootLoader;
- JVM_FindClassFromClass;
- JVM_FindClassFromClassLoader;
- JVM_FindLibraryEntry;
-diff -Nru cacao.orig/cacaog/src/native/vm/openjdk/jvm.cpp cacao/cacao-8948a434c10d/src/native/vm/openjdk/jvm.cpp
---- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp 2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2010-06-21 20:08:28.000000000 +0100
-@@ -668,6 +668,9 @@
-
- assert(throwError == false);
-
-+ if (name == NULL)
-+ return NULL;
-+
- u = utf_new_char(name);
- cl = loader_hashtable_classloader_add((java_handle_t *) loader);
-
-@@ -685,6 +688,15 @@
- }
-
-
-+/* JVM_FindClassFromBootLoader */
-+
-+jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char* name)
-+{
-+ TRACEJVMCALLS(("JVM_FindClassFromBootLoader(name=%s)", name));
-+ return JVM_FindClassFromClassLoader(env, name, JNI_FALSE,
-+ (jobject)NULL, false);
-+}
-+
- /* JVM_FindClassFromClass */
-
- jclass JVM_FindClassFromClass(JNIEnv *env, const char *name, jboolean init, jclass from)
More information about the distro-pkg-dev
mailing list