[java-1.7.0-openjdk/f16] - Use a newer snapshot and forest on classpath.org rather than on openjdk.net - Added in-tree-remova
Deepak Bhole
dbhole at fedoraproject.org
Fri Aug 5 19:48:31 UTC 2011
commit d629ab6922667706a8c4a58738fbec737e320f56
Author: Deepak Bhole <dbhole at redhat.com>
Date: Fri Aug 5 15:47:47 2011 -0400
- Use a newer snapshot and forest on classpath.org rather than on openjdk.net
- Added in-tree-removal script to remove libraries that we manually link
- Updated snapshots
- Added DISTRO_NAME and FreeType header/lib locations
- Removed application of patch100 and patch 113 (now in forest)
.gitignore | 1 +
boot-jdk-source-diamond.patch | 334 -----------------------------------------
bootstrap-ecj-diamond.patch | 12 --
java-1.7.0-openjdk.spec | 98 ++++++-------
remove-intree-libraries.sh | 92 +++++++++++
sources | 2 +-
text-relocations.patch | 63 --------
7 files changed, 140 insertions(+), 462 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a76a345..e475309 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/mauve-2008-10-22.tar.gz
/pulseaudio.tar.gz
/systemtap-tapset.tar.gz
+/icedtea-jdk7-20110803.tar.gz
diff --git a/bootstrap-ecj-diamond.patch b/bootstrap-ecj-diamond.patch
index 31ac17f..26da2d0 100644
--- a/bootstrap-ecj-diamond.patch
+++ b/bootstrap-ecj-diamond.patch
@@ -761,18 +761,6 @@ diff -up openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.jav
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
-diff -up openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java.sav openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java
---- openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java.sav 2011-07-29 12:21:04.000000000 -0400
-+++ openjdk-boot/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java 2011-07-29 14:27:07.770531498 -0400
-@@ -135,7 +135,7 @@ public class DnsContextFactory implement
- throw new ConfigurationException("DNS pseudo-URL required");
- }
-
-- List<String> servers = new ArrayList<>();
-+ List<String> servers = new ArrayList<String>();
-
- for (int i = 0; i < urls.length; i++) {
- String server = urls[i].getHost();
diff -up openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.sav openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
--- openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.sav 2011-07-29 12:21:06.000000000 -0400
+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2011-07-29 14:27:07.773531453 -0400
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 5afadf8..5ad722c 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -13,14 +13,14 @@
%global openjdkbuildver b%{openjdkver}
%global openjdkdate 27_jun_2011
-%global snapshot_date 20110729
+%global snapshot_date 20110803
%global icedtea_jdk7_snapshot 3defd24c2671
%global corba_snapshot 616c760dc288
-%global hotspot_snapshot d438a5890756
+%global hotspot_snapshot 1dd9b3d73b22
%global jaxp_snapshot c40983d6ae70
%global jaxws_snapshot 83db5e316798
-%global jdk_snapshot 9cf5ed6b45d6
-%global langtools_snapshot 0df09c966a29
+%global jdk_snapshot e46d527097f1
+%global langtools_snapshot fb7fb3071b64
%global accessmajorver 1.23
%global accessminorver 0
@@ -177,17 +177,17 @@ Group: Development/Languages
License: ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
URL: http://openjdk.java.net/
-# hg clone http://hg.openjdk.java.net/icedtea/jdk7/rev/%{icedtea_jdk7_snapshot} openjdk
-# hg clone http://hg.openjdk.java.net/icedtea/jdk7/corba/rev/%{corba_snapshot} openjdk/corba
-# hg clone http://hg.openjdk.java.net/icedtea/jdk7/hotspot/rev/%{hotspot_snapshot} openjdk/hotspot
-# hg clone http://hg.openjdk.java.net/icedtea/jdk7/jaxp/rev/%{jaxp_snapshot} openjdk/jaxp
-# hg clone http://hg.openjdk.java.net/icedtea/jdk7/jaxws/rev/%{jaxws_snapshot} openjdk/jaxws
-# hg clone http://hg.openjdk.java.net/icedtea/jdk7/jdk/rev/%{jdk_snapshot} openjdk/jdk
-# hg clone http://hg.openjdk.java.net/icedtea/jdk7/langtools/rev/%{langtools_snapshot} openjdk/langtools
+# hg clone http://icedtea.classpath.org/hg/icedtea7-forest/ openjdk -r %{icedtea_jdk7_snapshot}
+# hg clone http://icedtea.classpath.org/hg/icedtea7-forest/corba/ openjdk/corba -r %{corba_snapshot}
+# hg clone http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/ openjdk/hotspot -r %{hotspot_snapshot}
+# hg clone http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/ openjdk/jaxp -r %{jaxp_snapshot}
+# hg clone http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/ openjdk/jaxws -r %{jaxws_snapshot}
+# hg clone http://icedtea.classpath.org/hg/icedtea7-forest/jdk/ openjdk/jdk -r %{jdk_snapshot}
+# hg clone http://icedtea.classpath.org/hg/icedtea7-forest/langtools/ openjdk/langtools -r %{langtools_snapshot}
# find openjdk -name ".hg" -exec rm -rf '{}' \;
# find openjdk -name ".hgtags" -exec rm -rf '{}' \;
-# tar czf icedtea-jdk7.tar.gz openjdk
-Source0: icedtea-jdk7.tar.gz
+# tar czf icedtea-jdk7-%{snapshot_date}.tar.gz openjdk
+Source0: icedtea-jdk7-%{snapshot_date}.tar.gz
# Gnome access bridge
Source1: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
@@ -235,6 +235,9 @@ Source13: nss.cfg
# hg clone -r 877ad5f00f69 http://icedtea.classpath.org/hg/icedtea7
Source14: pulseaudio.tar.gz
+# Removed libraries that we link instead
+Source15: remove-intree-libraries.sh
+
# RPM/distribution specific patches
# Allow TCK to pass with access bridge wired in
@@ -257,50 +260,44 @@ Patch6: %{name}-debuginfo.patch
# OpenJDK specific patches
#
-# Use correct -fPIC/-fpic flag on all platforms.
-Patch100: text-relocations.patch
-
# Use system JPEG and zlib libraries.
-Patch101: libraries.patch
+Patch100: libraries.patch
# Add com.sun.image.codec.jpeg support
-Patch102: jpegclasses.patch
+Patch101: jpegclasses.patch
# Produces the "expected" behavior for full screen applications or other
# situations where developers wish to present elements that would cover things
# like panels
-Patch103: override-redirect-metacity.patch
+Patch102: override-redirect-metacity.patch
# GCC 4.3 miscompilation failure fix:
# http://icedtea.classpath.org/hg/icedtea/rev/f06de06e1ed4
-Patch104: hotspot-gcc-pr36917.patch
+Patch103: hotspot-gcc-pr36917.patch
# Add support for using an alternate jar tool in JDK building.
-Patch105: alt-jar.patch
+Patch104: alt-jar.patch
# FIXME: Uses size_t and idx_t types [May be obsolete]
-Patch106: use-idx_t.patch
+Patch105: use-idx_t.patch
# Cleans up crypto API to allow unlimited strength usage
-Patch107: clean-crypto.patch
+Patch106: clean-crypto.patch
# FIXME: Hardens code, unknown origin [May be obsolete]
-Patch108: jvmtiEnv.patch
+Patch107: jvmtiEnv.patch
# Add rhino jars to bootclasspath
-Patch109: update-bootclasspath.patch
+Patch108: update-bootclasspath.patch
# Updates list of files to be compiled
-Patch110: javafiles.patch
+Patch109: javafiles.patch
# Add rhino support
-Patch111: rhino.patch
+Patch110: rhino.patch
# We build from OpenJDK6 .. this causes some warnings. Make warnings non-fatal
-Patch112: make-warnings-nonfatal.patch
-
-# Tools are built with -source 6 -target 6 .. we need to remove diamond use in them
-Patch113: boot-jdk-source-diamond.patch
+Patch111: make-warnings-nonfatal.patch
#
# Bootstrap patches (code with this is never shipped)
@@ -612,8 +609,6 @@ cp %{SOURCE4} .
%patch109
%patch110
%patch111
-%patch112
-%patch113
# pulseaudio support
%if %{with_pulseaudio}
@@ -627,6 +622,9 @@ cp %{SOURCE4} .
%patch303
%endif
+# Remove libraries that are linked
+sh %{SOURCE15}
+
# Copy jaxp, jaf and jaxws drops
mkdir drops/
cp %{SOURCE5} drops/
@@ -822,24 +820,16 @@ make \
ALT_DROPS_DIR=$PWD/../drops \
ALT_JDK_IMPORT_PATH="$PWD/../bootstrap/jdk1.6.0" \
ANT="/usr/bin/ant" \
- BUILD_NUMBER="%{openjdkbuildver}" \
- JDK_UPDATE_VERSION="%{openjdkver}" \
- JRE_UPDATE_VERSION="fedora-%{release}-%{_arch} (%{javaver}_%{openjdkver}-%{openjdkbuildver}) on `date`" \
- MILESTONE="fcs" \
ALT_BOOTDIR="$PWD/../bootstrap/jdk1.6.0" \
ICEDTEA_RT="$PWD/../bootstrap/jdk1.6.0/jre/lib/rt.jar" \
- ALT_PARALLEL_COMPILE_JOBS="$NUM_PROC" \
HOTSPOT_BUILD_JOBS="$NUM_PROC" \
- DISTRIBUTION_ID="fedora-%{release}-%{_arch}" \
- STATIC_CXX="false" \
NO_DOCS="true" \
RHINO_JAR="$PWD/../rhino/rhino.jar" \
GENSRCDIR="$PWD/generated.build" \
- JAR_KNOWS_ATFILE="1" \
- JAR_KNOWS_J_OPTIONS="1" \
- JAR_ACCEPTS_STDIN_LIST="1" \
DISABLE_NIMBUS="true" \
- XSLT="/usr/bin/xsltproc"
+ XSLT="/usr/bin/xsltproc" \
+ FT2_CFLAGS="-I/usr/include/freetype2 " \
+ FT2_LIBS="-lfreetype "
export JDK_TO_BUILD_WITH=$PWD/build/linux-%{archbuild}/j2sdk-image
@@ -857,19 +847,16 @@ make \
ALT_DROPS_DIR=$PWD/../drops \
ALT_BOOTDIR="$JDK_TO_BUILD_WITH" \
ANT="/usr/bin/ant" \
- BUILD_NUMBER="%{openjdkbuildver}" \
- JDK_UPDATE_VERSION="%{openjdkver}" \
- JRE_UPDATE_VERSION="fedora-%{release}-%{_arch} (%{javaver}_%{openjdkver}-%{openjdkbuildver}) on `date`" \
+ DISTRO_NAME="Fedora" \
+ DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
+ JDK_UPDATE_VERSION="%{openjdkbuildver}" \
MILESTONE="fcs" \
- ALT_PARALLEL_COMPILE_JOBS="$NUM_PROC" \
HOTSPOT_BUILD_JOBS="$NUM_PROC" \
- DISTRIBUTION_ID="fedora-%{release}-%{_arch}" \
STATIC_CXX="false" \
RHINO_JAR="$PWD/../rhino/rhino.jar" \
GENSRCDIR="$PWD/generated.build" \
- JAR_KNOWS_ATFILE="1" \
- JAR_KNOWS_J_OPTIONS="1" \
- JAR_ACCEPTS_STDIN_LIST="1" \
+ FT2_CFLAGS="-I/usr/include/freetype2 " \
+ FT2_LIBS="-lfreetype " \
%{debugbuild}
popd >& /dev/null
@@ -1385,5 +1372,12 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
+* Fri Aug 05 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.0-0.1.20110803
+- Use a newer snapshot and forest on classpath.org rather than on openjdk.net
+- Added in-tree-removal script to remove libraries that we manually link
+- Updated snapshots
+- Added DISTRO_NAME and FreeType header/lib locations
+- Removed application of patch100 and patch 113 (now in forest)
+
* Wed Aug 03 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.0-0.1.20110729
- Initial build from java-1.6.0-openjdk RPM
diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
new file mode 100644
index 0000000..1fb918d
--- /dev/null
+++ b/remove-intree-libraries.sh
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+ZIP_SRC=jdk/src/share/native/java/util/zip/zlib-*
+JPEG_SRC=jdk/src/share/native/sun/awt/image/jpeg
+GIF_SRC=jdk/src/share/native/sun/awt/giflib
+PNG_SRC=jdk/src/share/native/sun/awt/libpng
+LCMS_SRC=jdk/src/share/native/sun/java2d/cmm/lcms
+
+echo "Removing built-in libs (they will be linked)"
+
+echo "Removing zlib"
+rm -rvf ${ZIP_SRC}
+echo "Removing libjpeg"
+rm -vf ${JPEG_SRC}/jcomapi.c
+rm -vf ${JPEG_SRC}/jdapimin.c
+rm -vf ${JPEG_SRC}/jdapistd.c
+rm -vf ${JPEG_SRC}/jdcoefct.c
+rm -vf ${JPEG_SRC}/jdcolor.c
+rm -vf ${JPEG_SRC}/jddctmgr.c
+rm -vf ${JPEG_SRC}/jdhuff.c
+rm -vf ${JPEG_SRC}/jdinput.c
+rm -vf ${JPEG_SRC}/jdmainct.
+rm -vf ${JPEG_SRC}/jdmarker.c
+rm -vf ${JPEG_SRC}/jdmaster.c
+rm -vf ${JPEG_SRC}/jdmerge.c
+rm -vf ${JPEG_SRC}/jdphuff.c
+rm -vf ${JPEG_SRC}/jdpostct.c
+rm -vf ${JPEG_SRC}/jdsample.c
+rm -vf ${JPEG_SRC}/jerror.c
+rm -vf ${JPEG_SRC}/jidctflt.c
+rm -vf ${JPEG_SRC}/jidctfst.c
+rm -vf ${JPEG_SRC}/jidctint.c
+rm -vf ${JPEG_SRC}/jidctred.c
+rm -vf ${JPEG_SRC}/jmemmgr.c
+rm -vf ${JPEG_SRC}/jmemnobs.c
+rm -vf ${JPEG_SRC}/jquant1.c
+rm -vf ${JPEG_SRC}/jquant2.c
+rm -vf ${JPEG_SRC}/jutils.c
+rm -vf ${JPEG_SRC}/jcapimin.c
+rm -vf ${JPEG_SRC}/jcapistd.c
+rm -vf ${JPEG_SRC}/jccoefct.c
+rm -vf ${JPEG_SRC}/jccolor.c
+rm -vf ${JPEG_SRC}/jcdctmgr.c
+rm -vf ${JPEG_SRC}/jchuff.c
+rm -vf ${JPEG_SRC}/jcinit.c
+rm -vf ${JPEG_SRC}/jcmainct.c
+rm -vf ${JPEG_SRC}/jcmarker.c
+rm -vf ${JPEG_SRC}/jcmaster.c
+rm -vf ${JPEG_SRC}/jcparam.c
+rm -vf ${JPEG_SRC}/jcphuff.c
+rm -vf ${JPEG_SRC}/jcprepct.c
+rm -vf ${JPEG_SRC}/jcsample.c
+rm -vf ${JPEG_SRC}/jctrans.c
+rm -vf ${JPEG_SRC}/jdtrans.c
+rm -vf ${JPEG_SRC}/jfdctflt.c
+rm -vf ${JPEG_SRC}/jfdctfst.c
+rm -vf ${JPEG_SRC}/jfdctint.c
+rm -vf ${JPEG_SRC}/README
+echo "Removing giflib"
+rm -rvf ${GIF_SRC}
+echo "Removing libpng"
+rm -rvf ${PNG_SRC}
+
+echo "Removing lcms"
+rm -vf ${LCMS_SRC}/cmscam02.c
+rm -vf ${LCMS_SRC}/cmscgats.c
+rm -vf ${LCMS_SRC}/cmscnvrt.c
+rm -vf ${LCMS_SRC}/cmserr.c
+rm -vf ${LCMS_SRC}/cmsgamma.c
+rm -vf ${LCMS_SRC}/cmsgmt.c
+rm -vf ${LCMS_SRC}/cmsintrp.c
+rm -vf ${LCMS_SRC}/cmsio0.c
+rm -vf ${LCMS_SRC}/cmsio1.c
+rm -vf ${LCMS_SRC}/cmslut.c
+rm -vf ${LCMS_SRC}/cmsmd5.c
+rm -vf ${LCMS_SRC}/cmsmtrx.c
+rm -vf ${LCMS_SRC}/cmsnamed.c
+rm -vf ${LCMS_SRC}/cmsopt.c
+rm -vf ${LCMS_SRC}/cmspack.c
+rm -vf ${LCMS_SRC}/cmspcs.c
+rm -vf ${LCMS_SRC}/cmsplugin.c
+rm -vf ${LCMS_SRC}/cmsps2.c
+rm -vf ${LCMS_SRC}/cmssamp.c
+rm -vf ${LCMS_SRC}/cmssm.c
+rm -vf ${LCMS_SRC}/cmstypes.c
+rm -vf ${LCMS_SRC}/cmsvirt.c
+rm -vf ${LCMS_SRC}/cmswtpnt.c
+rm -vf ${LCMS_SRC}/cmsxform.c
+rm -vf ${LCMS_SRC}/lcms2.h
+rm -vf ${LCMS_SRC}/lcms2_internal.h
+rm -vf ${LCMS_SRC}/lcms2_plugin.h
+
diff --git a/sources b/sources
index efd5156..01309e4 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
7df0a19525f26643d4cea3228fbbc6cc desktop-files.tar.gz
868ff2d4457d1a2dccfa465fb8220e1c generated-files.tar.gz
-f740e93f721145aa0d1adfeaa0f307ee icedtea-jdk7.tar.gz
+cdc6809d4b822c5690ace4dffc06150b icedtea-jdk7-20110803.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
32394c780c8fb5e29775f623525993c0 jaxp145_01.zip
18d15dfd71117daadb332af003d08212 jdk7-jaf-2010_08_19.zip
More information about the scm-commits
mailing list