/hg/icedtea: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 5 13:17:14 PDT 2010
changeset f8f817ae963c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f8f817ae963c
author: Jon VanAlten <jon.vanalten at redhat.com>
date: Wed May 05 19:36:23 2010 +0100
Check for libjpeg.so.7.
2009-10-26 Jon VanAlten <jon.vanalten at redhat.com>
Fixes Bug #367
* patches/icedtea-libraries.patch: Check for libjpeg.so.7.
* INSTALL: Indicate newer versions of libjpeg are supported.
changeset ffb51c29ed21 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ffb51c29ed21
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 05 20:49:53 2010 +0100
Use HotSpot URL from hotspot.map rather than hardcoding it.
2009-10-21 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Pick up HotSpot URL from hotspot.map.
changeset 250076689d36 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=250076689d36
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 05 21:01:03 2010 +0100
Add notes on using alternate HotSpot builds.
2009-05-14 Andrew John Hughes <ahughes at redhat.com>
* INSTALL: Add notes on using alternate HotSpot
builds.
changeset 04d256af92ed in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=04d256af92ed
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Oct 22 17:31:06 2009 +0100
Update HotSpot build documentation.
2009-10-22 Andrew John Hughes <ahughes at redhat.com>
* INSTALL: Update HotSpot build documentation.
diffstat:
5 files changed, 78 insertions(+), 13 deletions(-)
ChangeLog | 20 ++++++++++++++++
INSTALL | 47 ++++++++++++++++++++++++++++++++++++---
Makefile.am | 8 ++----
hotspot.map | 2 -
patches/icedtea-libraries.patch | 14 ++++++++---
diffs (166 lines):
diff -r 2451197e481e -r 04d256af92ed ChangeLog
--- a/ChangeLog Wed May 05 18:04:06 2010 +0100
+++ b/ChangeLog Thu Oct 22 17:31:06 2009 +0100
@@ -1,3 +1,23 @@ 2009-10-19 Mark Wielaard <mjw at redhat.c
+2009-10-22 Andrew John Hughes <ahughes at redhat.com>
+
+ * INSTALL:
+ Update HotSpot build documentation.
+
+2009-05-14 Andrew John Hughes <ahughes at redhat.com>
+
+ * INSTALL:
+ Add notes on using alternate HotSpot builds.
+
+2009-10-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Pick up HotSpot URL from hotspot.map.
+
+2009-10-26 Jon VanAlten <jon.vanalten at redhat.com>
+
+ * patches/icedtea-libraries.patch: Check for libjpeg.so.7.
+ * INSTALL: Indicate newer versions of libjpeg are supported.
+
2009-10-19 Mark Wielaard <mjw at redhat.com>
* tapset/hotspot_jni.stp.in: New tapset.
diff -r 2451197e481e -r 04d256af92ed INSTALL
--- a/INSTALL Wed May 05 18:04:06 2010 +0100
+++ b/INSTALL Thu Oct 22 17:31:06 2009 +0100
@@ -27,7 +27,7 @@ libXinerama-devel
libXinerama-devel
giflib-devel
libpng-devel
-libjpeg-devel = 6b
+libjpeg-devel >= 6b
zlib-devel
rhino (can be disabled using --without-rhino)
@@ -124,12 +124,53 @@ On architectures where hotspot is availa
--with-additional-vms=cacao,zero (or shark instead of zero)
on architectures where only zero (or shark) is available, use
--with-additional-vms=cacao
-to build the additional VM's. It's not possible to build cacao as the
+to build the additional VMs. It's not possible to build cacao as the
default VM, and zero as additional VM.
To build zero as the default VM and shark as an additional VM, use
--enable-zero --with-additional-vms=shark
-The additional VM's are available by calling the java with the option
+The additional VMs are available by calling the java with the option
`-cacao', `-zero' or `-shark', or by calling the java tools with
`-J-<vm name>'. If the build was configured with '--enable-shark',
use `-Xint' to just use the zero VM.
+
+Support for different versions of HotSpot
+-----------------------------------------
+
+IcedTea allows the version of HotSpot provided with the upstream build
+drop to be replaced with another. Support for this is provided by the
+--with-hotspot-build option which causes IcedTea to probe the
+hotspot.map file for an entry with the given build name. The
+hotspot.map file maps the name to a changeset from a given repository
+URL. During the build, it downloads HotSpot from
+${URL}/archive/${CHANGESET}.tar.gz and the resulting file is verified
+using the MD5 sum stored in hotspot.map.
+
+New build selections may be provided by providing further mappings in
+the hotspot.map file. The name can be anything
+e.g. 'shiny_new_hotspot'. This is simply used to map the argument to
+--with-hotspot-build to the values in the file and to apply
+appropriate patches (see patches/hotspot, $HSBUILD is available in
+Makefile.am for obtaining the build name). The special value
+'original' is used for patches/hotspot/original to denote those for
+the upstream HotSpot; this value does not appear in hotspot.map.
+
+The changeset and URL should refer to a valid HotSpot tree when used
+as above. The required values can be obtained from a local checkout
+or by using the web interface. The simplest way to calculate the MD5
+sum is to download the tarball and then run the 'md5sum' application
+on it. The resulting value should be added to hotspot.map.
+
+As with the OpenJDK build tarballs, the location of an alternate zip
+can be specified using --with-hotspot-src-zip. This skips the
+download stage and just verifies that the zip's MD5 sum matches that
+of the requested build.
+
+At present, two versions of HotSpot are officially supported. These
+are HotSpot 14 ('original') which is provided by the upstream OpenJDK
+tarball, and 'default', which is used in hotspot.map to provide the
+latest version of HotSpot 16. Thus, either --with-hotspot-build
+without an argument or --with-hotspot-build=default provides the
+latest supported hs16, while no HotSpot build argument,
+--without-hotspot-build or --with-hotspot-build=original uses the
+upstream HotSpot.
diff -r 2451197e481e -r 04d256af92ed Makefile.am
--- a/Makefile.am Wed May 05 18:04:06 2010 +0100
+++ b/Makefile.am Thu Oct 22 17:31:06 2009 +0100
@@ -40,8 +40,6 @@ JAXP_DROP_URL = https://jaxp.dev.java.ne
JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147490
JAXP_DROP_ZIP = jdk7-jaxp-m6.zip
JAXP_DROP_SHA256SUM = 3d9eb7ae71f5365e2a786ba270413c6cb7dc8d1137f56995c087908b3df8446c
-
-OPENJDK_HOTSPOT_URL = http://hg.openjdk.java.net/jdk7/hotspot/hotspot
ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
@@ -167,9 +165,9 @@ endif
endif
if WITH_ALT_HSBUILD
- HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
- HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
- HS_URL = $(OPENJDK_HOTSPOT_URL)
+ HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+ HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+ HS_URL = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
else
HS_SHA256SUM = $(HOTSPOT_SHA256SUM)
HS_CHANGESET = $(HOTSPOT_CHANGESET)
diff -r 2451197e481e -r 04d256af92ed hotspot.map
--- a/hotspot.map Wed May 05 18:04:06 2010 +0100
+++ b/hotspot.map Thu Oct 22 17:31:06 2009 +0100
@@ -1,1 +1,1 @@
-# version changeset md5sum
+# version url changeset md5sum
diff -r 2451197e481e -r 04d256af92ed patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch Wed May 05 18:04:06 2010 +0100
+++ b/patches/icedtea-libraries.patch Thu Oct 22 17:31:06 2009 +0100
@@ -700,14 +700,17 @@ diff -Nru openjdk.orig/jdk/src/share/nat
}
-@@ -2341,6 +2401,142 @@
+@@ -2341,6 +2401,145 @@
/********************** end of destination manager ************/
+METHODDEF(void)
+initIDs()
+{
-+ void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++ void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
++ if (handle == NULL) {
++ handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++ }
+
+ jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
+ if (jpegstderror == NULL) {
@@ -20984,11 +20987,14 @@ diff -Nru openjdk.orig/jdk/src/share/nat
/* Initialize the Java VM instance variable when the library is
first loaded */
JavaVM *jvm;
-@@ -462,6 +490,68 @@
+@@ -462,6 +490,71 @@
Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
jclass InputStreamClass)
{
-+ void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++ void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
++ if (handle == NULL) {
++ handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++ }
+
+ jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
+ if (jpegstderror == NULL) {
More information about the distro-pkg-dev
mailing list