comparison tck7/patches/Icedtea7_forest/java-1.7.0-openjdk-disable-system-lcms.patch @ 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
children
comparison
equal deleted inserted replaced
0:9a5b0309ff41 1:72d52b764c79
1 --- openjdk/jdk/make/jdk_generic_profile.sh.sav
2 +++ openjdk/jdk/make/jdk_generic_profile.sh
3 @@ -405,23 +405,6 @@
4 export ZLIB_CFLAGS
5 export ZLIB_LIBS
6
7 -# Export variables for system LCMS
8 -# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
9 -# link against lcms2
10 -if [ -x "${pkgconfig}" ] ; then
11 - if [ "${LCMS_CFLAGS}" = "" ] ; then
12 - LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
13 - fi
14 - if [ "${LCMS_LIBS}" = "" ] ; then
15 - LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
16 - fi
17 -fi
18 -if [ "${LCMS_LIBS}" = "" ] ; then
19 - LCMS_LIBS="-llcms2"
20 -fi
21 -export LCMS_CFLAGS
22 -export LCMS_LIBS
23 -
24 # Export variables for system jpeg
25 # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
26 # link against libjpeg
27 @@ -549,7 +532,6 @@
28 fi
29
30 # IcedTea defaults; use system libraries
31 -export SYSTEM_LCMS=true
32 export SYSTEM_ZLIB=true
33 export SYSTEM_JPEG=true
34 export SYSTEM_PNG=true