changeset 1:72d52b764c79 draft

Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Tue, 01 Apr 2014 11:51:10 +0200
parents 9a5b0309ff41
children 09a912dabc95
files ChangeLog tck7/patches/Icedtea7_forest/java-1.7.0-openjdk-disable-system-lcms.patch tck7/patches/Icedtea7_forest_2_1/java-1.7.0-openjdk-disable-system-lcms.patch tck7/patches/Icedtea7_forest_2_3/java-1.7.0-openjdk-disable-system-lcms.patch tck7/patches/Icedtea7_forest_2_4/java-1.7.0-openjdk-disable-system-lcms.patch
diffstat 5 files changed, 147 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 31 12:58:54 2014 +0200
+++ b/ChangeLog	Tue Apr 01 11:51:10 2014 +0200
@@ -0,0 +1,9 @@
+2014-04-01  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* tck7/patches/Icedtea7_forest/java-1.7.0-openjdk-disable-system-lcms.patch:
+	* tck7/patches/Icedtea7_forest_2_1/java-1.7.0-openjdk-disable-system-lcms.patch:
+	* tck7/patches/Icedtea7_forest_2_3/java-1.7.0-openjdk-disable-system-lcms.patch:
+	* tck7/patches/Icedtea7_forest_2_4/java-1.7.0-openjdk-disable-system-lcms.patch:
+	Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3
+	and IcedTea7-2.4 build.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tck7/patches/Icedtea7_forest/java-1.7.0-openjdk-disable-system-lcms.patch	Tue Apr 01 11:51:10 2014 +0200
@@ -0,0 +1,34 @@
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav
++++ openjdk/jdk/make/jdk_generic_profile.sh
+@@ -405,23 +405,6 @@
+ export ZLIB_CFLAGS
+ export ZLIB_LIBS
+ 
+-# Export variables for system LCMS
+-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
+-# link against lcms2
+-if [ -x "${pkgconfig}" ] ; then
+-  if [ "${LCMS_CFLAGS}" = "" ] ; then
+-    LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
+-  fi
+-  if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
+-  fi
+-fi
+-if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS="-llcms2"
+-fi
+-export LCMS_CFLAGS
+-export LCMS_LIBS
+-
+ # Export variables for system jpeg
+ # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
+ # link against libjpeg
+@@ -549,7 +532,6 @@
+ fi
+ 
+ # IcedTea defaults; use system libraries
+-export SYSTEM_LCMS=true
+ export SYSTEM_ZLIB=true
+ export SYSTEM_JPEG=true
+ export SYSTEM_PNG=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tck7/patches/Icedtea7_forest_2_1/java-1.7.0-openjdk-disable-system-lcms.patch	Tue Apr 01 11:51:10 2014 +0200
@@ -0,0 +1,35 @@
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav
++++ openjdk/jdk/make/jdk_generic_profile.sh
+@@ -381,24 +381,6 @@
+   fi
+ fi
+ 
+-# Export variables for system LCMS
+-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
+-# link against lcms2
+-pkgconfig=$(which pkg-config 2>/dev/null)
+-if [ -x "${pkgconfig}" ] ; then
+-  if [ "${LCMS_CFLAGS}" = "" ] ; then
+-    LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
+-  fi
+-  if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
+-  fi
+-fi
+-if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS="-llcms2"
+-fi
+-export LCMS_CFLAGS
+-export LCMS_LIBS
+-
+ # Export variables for system zlib
+ # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
+ # link against zlib
+@@ -452,7 +434,6 @@
+ export GIF_LIBS
+ 
+ # IcedTea defaults; use system libraries
+-export USE_SYSTEM_LCMS=true
+ export USE_SYSTEM_ZLIB=true
+ export USE_SYSTEM_JPEG=true
+ export USE_SYSTEM_PNG=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tck7/patches/Icedtea7_forest_2_3/java-1.7.0-openjdk-disable-system-lcms.patch	Tue Apr 01 11:51:10 2014 +0200
@@ -0,0 +1,35 @@
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav
++++ openjdk/jdk/make/jdk_generic_profile.sh
+@@ -381,24 +381,6 @@
+   fi
+ fi
+ 
+-# Export variables for system LCMS
+-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
+-# link against lcms2
+-pkgconfig=$(which pkg-config 2>/dev/null)
+-if [ -x "${pkgconfig}" ] ; then
+-  if [ "${LCMS_CFLAGS}" = "" ] ; then
+-    LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
+-  fi
+-  if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
+-  fi
+-fi
+-if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS="-llcms2"
+-fi
+-export LCMS_CFLAGS
+-export LCMS_LIBS
+-
+ # Export variables for system zlib
+ # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
+ # link against zlib
+@@ -452,7 +434,6 @@
+ export GIF_LIBS
+ 
+ # IcedTea defaults; use system libraries
+-export USE_SYSTEM_LCMS=true
+ export USE_SYSTEM_ZLIB=true
+ export USE_SYSTEM_JPEG=true
+ export USE_SYSTEM_PNG=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tck7/patches/Icedtea7_forest_2_4/java-1.7.0-openjdk-disable-system-lcms.patch	Tue Apr 01 11:51:10 2014 +0200
@@ -0,0 +1,34 @@
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav
++++ openjdk/jdk/make/jdk_generic_profile.sh
+@@ -399,23 +399,6 @@
+ export ZLIB_CFLAGS
+ export ZLIB_LIBS
+ 
+-# Export variables for system LCMS
+-# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
+-# link against lcms2
+-pkgconfig=$(which pkg-config 2>/dev/null)
+-if [ -x "${pkgconfig}" ] ; then
+-  if [ "${LCMS_CFLAGS}" = "" ] ; then
+-    LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
+-  fi
+-  if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
+-  fi
+-fi
+-if [ "${LCMS_LIBS}" = "" ] ; then
+-    LCMS_LIBS="-llcms2"
+-fi
+-export LCMS_CFLAGS
+-export LCMS_LIBS
+ 
+ # Export variables for system jpeg
+ # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
+@@ -463,7 +446,6 @@
+ fi
+ 
+ # IcedTea defaults; use system libraries
+-export USE_SYSTEM_LCMS=true
+ export SYSTEM_ZLIB=true
+ export USE_SYSTEM_JPEG=true
+ export USE_SYSTEM_PNG=true