diff options
author | Jens Rehsack <rehsack@gmail.com> | 2015-10-16 19:29:38 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-10-19 10:12:53 -0200 |
commit | 2dcff5266a6c1ed39e49b24b8d2984a165ad9c35 (patch) | |
tree | 86757e1611e29bc17a3decf678f2c5e25c2ed0a6 /recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch | |
parent | a73939323984fca1e919d3408d3301ccdbceac9c (diff) | |
download | meta-java-2dcff5266a6c1ed39e49b24b8d2984a165ad9c35.tar.gz |
openjdk-6: remove
Since OpenJDK-6 is not maintained anymore, it's more reasonable to move to OpenJDK-8 instead
of sticking at unmaintained, upstream not supported VM version.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch deleted file mode 100644 index 8812cf2..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | Index: icedtea6/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6.orig/Makefile.am 2011-12-21 21:24:25.000000000 +0100 | ||
4 | +++ icedtea6/Makefile.am 2011-12-21 22:50:11.649227590 +0100 | ||
5 | @@ -538,6 +538,11 @@ | ||
6 | JAVAC="" \ | ||
7 | JAVA_HOME="" \ | ||
8 | JDK_HOME="" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | + OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ | ||
14 | DISTRIBUTION_ID="$(DIST_ID)" \ | ||
15 | DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ | ||
16 | DEBUG_CLASSFILES="true" \ | ||
17 | @@ -1851,12 +1856,16 @@ | ||
18 | if BUILD_JAMVM | ||
19 | cd jamvm/jamvm && \ | ||
20 | LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ | ||
21 | - ./autogen.sh --with-java-runtime-library=openjdk \ | ||
22 | - --prefix=$(abs_top_builddir)/jamvm/install ; \ | ||
23 | - $(MAKE) ; \ | ||
24 | - $(MAKE) install | ||
25 | + $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk \ | ||
26 | + --prefix=/usr/lib \ | ||
27 | + --host=$(host_alias) \ | ||
28 | + --build=$(build_alias) \ | ||
29 | + --target=$(target_alias) \ | ||
30 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ | ||
31 | + $(ARCH_PREFIX) $(MAKE) ; \ | ||
32 | + $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install | ||
33 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
34 | - cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
35 | + cp $(abs_top_builddir)/jamvm/install/usr/lib/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
36 | ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client | ||
37 | touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt | ||
38 | ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so | ||
39 | @@ -1874,7 +1883,7 @@ | ||
40 | stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp | ||
41 | if ADD_JAMVM_BUILD | ||
42 | mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm | ||
43 | - install -m 644 jamvm/install/lib/libjvm.so \ | ||
44 | + install -m 644 jamvm/install/usr/lib/lib/libjvm.so \ | ||
45 | $(BUILD_JRE_ARCH_DIR)/jamvm/ | ||
46 | printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg | ||
47 | else | ||
48 | @@ -1918,6 +1927,7 @@ | ||
49 | --host=$(host_alias) \ | ||
50 | --build=$(build_alias) \ | ||
51 | --target=$(target_alias) \ | ||
52 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ | ||
53 | --prefix=$(abs_top_builddir)/cacao/install \ | ||
54 | --with-java-runtime-library=openjdk \ | ||
55 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | ||
56 | @@ -1984,7 +1994,7 @@ | ||
57 | # configure script arguments, quoted in single quotes | ||
58 | CONFIGURE_ARGS = @CONFIGURE_ARGS@ | ||
59 | ADD_ZERO_CONFIGURE_ARGS = \ | ||
60 | - --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \ | ||
61 | + --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ | ||
62 | --enable-zero | ||
63 | if ADD_SHARK_BUILD | ||
64 | ADD_ZERO_CONFIGURE_ARGS += \ | ||
65 | Index: icedtea6/javac.in | ||
66 | =================================================================== | ||
67 | --- icedtea6.orig/javac.in 2011-12-21 21:24:30.000000000 +0100 | ||
68 | +++ icedtea6/javac.in 2011-12-21 22:44:25.860460813 +0100 | ||
69 | @@ -45,7 +45,9 @@ | ||
70 | my @CLASSPATH = ('@ECJ_JAR@'); | ||
71 | push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; | ||
72 | $ENV{"CLASSPATH"} = join ':', @CLASSPATH; | ||
73 | - exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args; | ||
74 | + # Compiling hotspot-tools consumes tons of memory and exceeds any default | ||
75 | + # limits for jamvm and cacao. | ||
76 | + exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args; | ||
77 | } | ||
78 | else | ||
79 | { | ||