[java-1.7.0-openjdk] added missing java-1.7.0-openjdk-disable-system-lcms.patch (Patch500)

jiri vanek jvanek at fedoraproject.org
Wed Jun 19 07:09:04 UTC 2013


commit 897e388dcd6164e96720138581c1cf86f01809b3
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Jun 19 09:08:30 2013 +0200

    added missing  java-1.7.0-openjdk-disable-system-lcms.patch (Patch500)

 java-1.7.0-openjdk-disable-system-lcms.patch |   36 ++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/java-1.7.0-openjdk-disable-system-lcms.patch b/java-1.7.0-openjdk-disable-system-lcms.patch
new file mode 100644
index 0000000..b0e8a3c
--- /dev/null
+++ b/java-1.7.0-openjdk-disable-system-lcms.patch
@@ -0,0 +1,36 @@
+diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
+--- openjdk/jdk/make/jdk_generic_profile.sh.sav	2012-03-19 17:33:21.147566973 -0400
++++ openjdk/jdk/make/jdk_generic_profile.sh	2012-03-19 17:33:32.877391463 -0400
+@@ -381,24 +381,6 @@ if [ "${ZERO_BUILD}" = true ] ; then
+   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 @@ fi
+ 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


More information about the scm-commits mailing list