/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset d9e0d17a294a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d9e0d17a294a
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 21 16:11:56 2010 +0000

	PR icedtea/433: Add set -e before tarball extraction so a failure
	stops the build.

	2010-01-21 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/433
		* Makefile.am: Add set -e to tarball extractions so
	that they fail immediately.


changeset fcd85ef6c2ae in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fcd85ef6c2ae
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 15:35:21 2010 +0000

	Support libjpeg8 and always choose the dlopen invocation at build
	time.

	2010-01-25 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-libraries.patch: Make all dlopen
	choices at build-time, not just one. Support libjpeg8 as
	well.


diffstat:

3 files changed, 33 insertions(+), 5 deletions(-)
ChangeLog                       |   13 +++++++++++++
Makefile.am                     |    6 ++++++
patches/icedtea-libraries.patch |   19 ++++++++++++++-----

diffs (117 lines):

diff -r b227a81ef16c -r fcd85ef6c2ae ChangeLog
--- a/ChangeLog	Thu Jan 21 17:56:18 2010 +0000
+++ b/ChangeLog	Mon Jan 25 15:35:21 2010 +0000
@@ -1,3 +1,16 @@ 2010-01-21  Edward Nevill   <ed at camswl.c
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-libraries.patch:
+	Make all dlopen choices at build-time,
+	not just one.  Support libjpeg8 as well.
+	
+2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/433
+	* Makefile.am:
+	Add set -e to tarball extractions so
+	that they fail immediately.
+
 2010-01-21  Edward Nevill   <ed at camswl.com>
 
 	* zeroshark.make, asm_helper.cpp, bytecodes_arm.def,
diff -r b227a81ef16c -r fcd85ef6c2ae Makefile.am
--- a/Makefile.am	Thu Jan 21 17:56:18 2010 +0000
+++ b/Makefile.am	Mon Jan 25 15:35:21 2010 +0000
@@ -775,6 +775,7 @@ if OPENJDK_SRC_DIR_FOUND
 if OPENJDK_SRC_DIR_FOUND
 	cp -a $(OPENJDK_SRC_DIR) openjdk
 else
+	set -e ; \
 	if ! test -d openjdk ; \
 	then \
 	  mkdir openjdk ; \
@@ -786,12 +787,14 @@ if BUILD_CACAO
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 if USE_ALT_CACAO_SRC_DIR
+	set -e ; \
 	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 ; \
 	then \
 	  mkdir cacao ; \
@@ -803,17 +806,20 @@ endif
 endif
 endif
 if WITH_VISUALVM
+	set -e ; \
 	if ! test -d netbeans ; \
 	then \
 	  mkdir netbeans ; \
 	  $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
 	fi
 
+	set -e ; \
 	if ! test -d visualvm ; \
 	then \
 	  $(TAR) xf $(VISUALVM_SRC_ZIP) ; \
 	fi
 endif
+	set -e ; \
 	if [ ! -e $(abs_top_builddir)/generated ]; then \
 	  cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
 	  find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
diff -r b227a81ef16c -r fcd85ef6c2ae patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Thu Jan 21 17:56:18 2010 +0000
+++ b/patches/icedtea-libraries.patch	Mon Jan 25 15:35:21 2010 +0000
@@ -25045,17 +25045,21 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
  }
  
  
-@@ -2317,6 +2377,146 @@
+@@ -2317,6 +2377,150 @@
  
  /********************** end of destination manager ************/
  
 +METHODDEF(void)
 +initIDs()
 +{
++#if JPEG_LIB_VERSION >= 80
++    void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
++#else
 +#if JPEG_LIB_VERSION >= 70
 +    void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
 +#else
 +    void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++#endif
 +#endif
 +    
 +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
@@ -25343,14 +25347,19 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
  /* Initialize the Java VM instance variable when the library is
     first loaded */
  JavaVM *jvm;
-@@ -462,6 +493,71 @@
+@@ -462,6 +493,76 @@
  Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
                                              jclass InputStreamClass)
  {
++#if JPEG_LIB_VERSION >= 80
++    void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
++#else
++#if JPEG_LIB_VERSION >= 70
 +    void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
-+    if (handle == NULL) {
-+       handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-+    }
++#else
++    void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++#endif
++#endif
 + 
 +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
 +    if (jpegstderror == NULL) {