annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
1 --- openjdk/jdk/make/jdk_generic_profile.sh.sav
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
2 +++ openjdk/jdk/make/jdk_generic_profile.sh
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
3 @@ -381,24 +381,6 @@
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
4 fi
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
5 fi
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
6
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
7 -# Export variables for system LCMS
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
8 -# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
9 -# link against lcms2
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
10 -pkgconfig=$(which pkg-config 2>/dev/null)
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
11 -if [ -x "${pkgconfig}" ] ; then
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
12 - if [ "${LCMS_CFLAGS}" = "" ] ; then
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
13 - LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2)
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
14 - fi
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
15 - if [ "${LCMS_LIBS}" = "" ] ; then
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
16 - LCMS_LIBS=$("${pkgconfig}" --libs lcms2)
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
17 - fi
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
18 -fi
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
19 -if [ "${LCMS_LIBS}" = "" ] ; then
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
20 - LCMS_LIBS="-llcms2"
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
21 -fi
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
22 -export LCMS_CFLAGS
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
23 -export LCMS_LIBS
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
24 -
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
25 # Export variables for system zlib
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
26 # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
27 # link against zlib
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
28 @@ -452,7 +434,6 @@
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
29 export GIF_LIBS
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
30
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
31 # IcedTea defaults; use system libraries
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
32 -export USE_SYSTEM_LCMS=true
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
33 export USE_SYSTEM_ZLIB=true
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
34 export USE_SYSTEM_JPEG=true
72d52b764c79 Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
Pavel Tisnovsky <ptisnovs@redhat.com>
parents:
diff changeset
35 export USE_SYSTEM_PNG=true