[java-1.7.0-openjdk] - Added patch to fix bug in jdk_generic_profile.sh - Compile with generic profile to use system libr
Deepak Bhole
dbhole at fedoraproject.org
Tue Nov 8 23:10:05 UTC 2011
commit 308630c6e238f591ad90a92fed0702986856c418
Author: Deepak Bhole <dbhole at redhat.com>
Date: Tue Nov 8 18:09:47 2011 -0500
- Added patch to fix bug in jdk_generic_profile.sh
- Compile with generic profile to use system libraries
- Made remove-intree-libraries.sh more robust
java-1.7.0-openjdk-system-zlib.patch | 12 ++++++++++++
java-1.7.0-openjdk.spec | 34 +++++++++++++++++++++++++---------
remove-intree-libraries.sh | 34 +++++++++++++++++++++++++++++-----
3 files changed, 66 insertions(+), 14 deletions(-)
---
diff --git a/java-1.7.0-openjdk-system-zlib.patch b/java-1.7.0-openjdk-system-zlib.patch
new file mode 100644
index 0000000..627ebd1
--- /dev/null
+++ b/java-1.7.0-openjdk-system-zlib.patch
@@ -0,0 +1,12 @@
+diff -ur openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh
+--- openjdk.orig/jdk/make/jdk_generic_profile.sh 2011-10-20 16:12:28.000000000 -0400
++++ openjdk/jdk/make/jdk_generic_profile.sh 2011-11-08 11:32:53.365858929 -0500
+@@ -421,7 +421,7 @@
+ # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
+ # link against libjpeg
+ if [ "${JPEG_LIBS}" = "" ] ; then
+- ZLIB_LIBS="-ljpeg"
++ JPEG_LIBS="-ljpeg"
+ fi
+ export JPEG_LIBS
+
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 3d33cf2..98612f8 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -151,7 +151,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.2%{?dist}
+Release: %{icedtea_version}.3%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -236,8 +236,13 @@ Patch4: java-1.7.0-openjdk-accessible-toolkit.patch
# Build docs even in debug
Patch5: java-1.7.0-openjdk-debugdocs.patch
+
+# Add debuginfo where missing
Patch6: %{name}-debuginfo.patch
+# Fix bug in jdk_generic_profile.sh
+Patch7: %{name}-system-zlib.patch
+
#
# OpenJDK specific patches
#
@@ -659,6 +664,8 @@ patch -l -p0 < %{PATCH5}
patch -l -p0 < %{PATCH6}
%endif
+patch -l -p0 < %{PATCH7}
+
# Build the re-written rhino jar
mkdir -p rhino/{old,new}
@@ -746,9 +753,13 @@ pushd openjdk-boot
cp -a ../generated generated.build
chmod u+rwx generated.build
+export ALT_DROPS_DIR=$PWD/../drops
+export ALT_JDK_IMPORT_PATH="$PWD/../bootstrap/jdk1.6.0"
+
+# Set generic profile
+source jdk/make/jdk_generic_profile.sh
+
make \
- ALT_DROPS_DIR=$PWD/../drops \
- ALT_JDK_IMPORT_PATH="$PWD/../bootstrap/jdk1.6.0" \
ANT="/usr/bin/ant" \
ALT_BOOTDIR="$PWD/../bootstrap/jdk1.6.0" \
ICEDTEA_RT="$PWD/../bootstrap/jdk1.6.0/jre/lib/rt.jar" \
@@ -773,9 +784,13 @@ export JDK_TO_BUILD_WITH=/usr/lib/jvm/java-openjdk
pushd openjdk >& /dev/null
+export ALT_DROPS_DIR=$PWD/../drops
+export ALT_BOOTDIR="$JDK_TO_BUILD_WITH"
+
+# Set generic profile
+source jdk/make/jdk_generic_profile.sh
+
make \
- ALT_DROPS_DIR=$PWD/../drops \
- ALT_BOOTDIR="$JDK_TO_BUILD_WITH" \
ANT="/usr/bin/ant" \
DISTRO_NAME="Fedora" \
DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
@@ -787,10 +802,6 @@ make \
GENSRCDIR="$PWD/generated.build" \
FT2_CFLAGS="-I/usr/include/freetype2 " \
FT2_LIBS="-lfreetype " \
- USE_SYSTEM_JPEG="true" \
- JPEG_LIBS="-ljpeg" \
- JPEG_CFLAGS="" \
- DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
%{debugbuild}
@@ -1310,6 +1321,11 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
+* Tue Nov 08 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.1-2.0.3
+- Added patch to fix bug in jdk_generic_profile.sh
+- Compile with generic profile to use system libraries
+- Made remove-intree-libraries.sh more robust
+
* Sun Nov 06 2011 Deepak Bhole <dbhole at redhat.com> - 1.7.0.1-2.0.2
- Added missing changelog entry
- Updated Provides
diff --git a/remove-intree-libraries.sh b/remove-intree-libraries.sh
index 1fb918d..da15d9e 100644
--- a/remove-intree-libraries.sh
+++ b/remove-intree-libraries.sh
@@ -1,16 +1,26 @@
#!/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
+ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-*
+JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeg-6b
+GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
+PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng
+LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms
echo "Removing built-in libs (they will be linked)"
echo "Removing zlib"
+if [ ! -d ${ZIP_SRC} ]; then
+ echo "${ZIP_SRC} does not exist. Refusing to proceed."
+ exit 1
+fi
rm -rvf ${ZIP_SRC}
+
echo "Removing libjpeg"
+if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that sound definitely exist
+ echo "${JPEG_SRC} does not contain jpeg sources. Refusing to proceed."
+ exit 1
+fi
+
rm -vf ${JPEG_SRC}/jcomapi.c
rm -vf ${JPEG_SRC}/jdapimin.c
rm -vf ${JPEG_SRC}/jdapistd.c
@@ -56,12 +66,26 @@ 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"
+if [ ! -d ${GIF_SRC} ]; then
+ echo "${GIF_SRC} does not exist. Refusing to proceed."
+ exit 1
+fi
rm -rvf ${GIF_SRC}
+
echo "Removing libpng"
+if [ ! -d ${PNG_SRC} ]; then
+ echo "${PNG_SRC} does not exist. Refusing to proceed."
+ exit 1
+fi
rm -rvf ${PNG_SRC}
echo "Removing lcms"
+if [ ! -d ${LCMS_SRC} ]; then
+ echo "${LCMS_SRC} does not exist. Refusing to proceed."
+ exit 1
+fi
rm -vf ${LCMS_SRC}/cmscam02.c
rm -vf ${LCMS_SRC}/cmscgats.c
rm -vf ${LCMS_SRC}/cmscnvrt.c
More information about the scm-commits
mailing list