comparison tck7/patches/Icedtea7_forest_2_1/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 @@ -381,24 +381,6 @@
4 fi
5 fi
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 -pkgconfig=$(which pkg-config 2>/dev/null)
11 -if [ -x "${pkgconfig}" ] ; then
12 - if [ "${LCMS_CFLAGS}" = "" ] ; then
13 - LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
14 - fi
15 - if [ "${LCMS_LIBS}" = "" ] ; then
16 - LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
17 - fi
18 -fi
19 -if [ "${LCMS_LIBS}" = "" ] ; then
20 - LCMS_LIBS="-llcms2"
21 -fi
22 -export LCMS_CFLAGS
23 -export LCMS_LIBS
24 -
25 # Export variables for system zlib
26 # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
27 # link against zlib
28 @@ -452,7 +434,6 @@
29 export GIF_LIBS
30
31 # IcedTea defaults; use system libraries
32 -export USE_SYSTEM_LCMS=true
33 export USE_SYSTEM_ZLIB=true
34 export USE_SYSTEM_JPEG=true
35 export USE_SYSTEM_PNG=true