summaryrefslogtreecommitdiffstats
path: root/recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2012-11-22 18:47:13 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-11-22 18:49:40 +0100
commit7dbdd2420d3888d8b7e4e1418ba1bbfe0b1f687c (patch)
treeca625d3583eee077c9750bd47a97b83e8ffef540 /recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch
parente6e59540e4540dfca17c5904aad6fdc23cf6934e (diff)
downloadmeta-java-7dbdd2420d3888d8b7e4e1418ba1bbfe0b1f687c.tar.gz
icedtea7-native: simple copy over from openjdk-7 branch
Diffstat (limited to 'recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch')
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch b/recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch
new file mode 100644
index 0000000..cc8e8b1
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch
@@ -0,0 +1,41 @@
1Index: icedtea-2.1/Makefile.am
2===================================================================
3--- icedtea-2.1.orig/Makefile.am
4+++ icedtea-2.1/Makefile.am
5@@ -413,6 +413,10 @@ ICEDTEA_ENV = \
6 FT2_LIBS="$(FREETYPE2_LIBS)" \
7 ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
8 HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
9+ OE_CFLAGS="$(OE_CFLAGS)" \
10+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \
11+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \
12+ OE_LDFLAGS="$(OE_LDFLAGS)" \
13 JAVAC="" \
14 JAVA_HOME="" \
15 JDK_HOME="" \
16@@ -428,10 +432,7 @@ ICEDTEA_ENV = \
17 VERBOSE="$(VERBOSE)" \
18 STATIC_CXX="false" \
19 BUILD_GCC="$(CC)" \
20- BUILD_CPP="$(CXX)" \
21- USE_SYSTEM_CUPS="true" \
22- CUPS_LIBS="${CUPS_LIBS}" \
23- CUPS_CFLAGS="${CUPS_CFLAGS}"
24+ BUILD_CPP="$(CXX)"
25
26 if ENABLE_CACAO
27 ICEDTEA_ENV += \
28@@ -504,12 +505,8 @@ ICEDTEA_ENV += \
29 GIF_CFLAGS="${GIF_CFLAGS}"
30 endif
31
32-if USE_SYSTEM_GTK
33 ICEDTEA_ENV += \
34- USE_SYSTEM_GTK="true" \
35- GTK_LIBS="${GTK_LIBS}" \
36- GTK_CFLAGS="${GTK_CFLAGS}"
37-endif
38+ USE_SYSTEM_GTK="false"
39
40 if USE_SYSTEM_GIO
41 ICEDTEA_ENV += \