diff options
| author | Richard Leitner <richard.leitner@skidata.com> | 2015-10-28 13:07:19 +0100 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-10-28 10:17:57 -0200 |
| commit | ed95222b71cc58f6039bdf944b0e11ce00fb0bf5 (patch) | |
| tree | 332588676d80a2fbc276c9a0691d74f96a5a0ea0 /recipes-core/openjdk/openjdk-7-85b01/build-hacks.patch | |
| parent | d3b7aaba7df3ef623e1441470abaf29e200d5cfd (diff) | |
| download | meta-java-ed95222b71cc58f6039bdf944b0e11ce00fb0bf5.tar.gz | |
openjdk-7: update to IcedTea 2.6.2 OpenJDK 7u91b01
IcedTea 2.6.2 provides OpenJDK 7u91, which adds the October 2015 security
updates. For more details see:
http://blog.fuseyism.com/index.php/2015/10/23/security-icedtea-2-6-2-for-openjdk-7-released/
Furthermore the patches directory for OpenJDK-7 was renamed to avoid the version number.
This makes it easier for upgrades and to see diff's between patches.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-85b01/build-hacks.patch')
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-85b01/build-hacks.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/recipes-core/openjdk/openjdk-7-85b01/build-hacks.patch b/recipes-core/openjdk/openjdk-7-85b01/build-hacks.patch deleted file mode 100644 index 012c4cb..0000000 --- a/recipes-core/openjdk/openjdk-7-85b01/build-hacks.patch +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | --- icedtea-2.6.1/Makefile.am.orig 2015-07-24 08:52:12.442036786 +0200 | ||
| 2 | +++ icedtea-2.6.1/Makefile.am 2015-07-24 08:58:25.046029702 +0200 | ||
| 3 | @@ -605,6 +605,12 @@ | ||
| 4 | FT2_LIBS="$(FREETYPE2_LIBS)" \ | ||
| 5 | ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ | ||
| 6 | HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ | ||
| 7 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
| 8 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
| 9 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
| 10 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
| 11 | + OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ | ||
| 12 | + DISTRIBUTION_ID="$(DIST_ID)" \ | ||
| 13 | QUIETLY="" \ | ||
| 14 | ANT_RESPECT_JAVA_HOME="TRUE" \ | ||
| 15 | DISTRIBUTION_ID="$(DIST_ID)" \ | ||
| 16 | @@ -2077,8 +2083,8 @@ | ||
| 17 | rm -f stamps/add-tzdata-support.stamp | ||
| 18 | |||
| 19 | stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp | ||
| 20 | - if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ | ||
| 21 | - $(BUILD_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
| 22 | + if [ -e $(BOOT_DIR)/bin/java ] ; then \ | ||
| 23 | + $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
| 24 | fi | ||
| 25 | mkdir -p stamps | ||
| 26 | touch $@ | ||
| 27 | @@ -2483,7 +2489,11 @@ | ||
| 28 | if BUILD_JAMVM | ||
| 29 | cd jamvm/jamvm && \ | ||
| 30 | ./autogen.sh --with-java-runtime-library=openjdk7 \ | ||
| 31 | - --prefix=$(abs_top_builddir)/jamvm/install ; \ | ||
| 32 | + --prefix=$(abs_top_builddir)/jamvm/install \ | ||
| 33 | + --host=$(host_alias) \ | ||
| 34 | + --build=$(build_alias) \ | ||
| 35 | + --target=$(target_alias) \ | ||
| 36 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ | ||
| 37 | $(MAKE) ; \ | ||
| 38 | $(MAKE) install | ||
| 39 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
| 40 | @@ -2548,6 +2558,7 @@ | ||
| 41 | --host=$(host_alias) \ | ||
| 42 | --build=$(build_alias) \ | ||
| 43 | --target=$(target_alias) \ | ||
| 44 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ | ||
| 45 | --prefix=$(abs_top_builddir)/cacao/install \ | ||
| 46 | --with-java-runtime-library=openjdk7 \ | ||
| 47 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | ||
| 48 | @@ -2616,7 +2627,7 @@ | ||
| 49 | # configure script arguments, quoted in single quotes | ||
| 50 | CONFIGURE_ARGS = @CONFIGURE_ARGS@ | ||
| 51 | ADD_ZERO_CONFIGURE_ARGS = \ | ||
| 52 | - --with-jdk-home=$(BUILD_SDK_DIR) \ | ||
| 53 | + --with-jdk-home=$(BOOT_DIR) \ | ||
| 54 | --disable-bootstrap --enable-zero | ||
| 55 | if ADD_SHARK_BUILD | ||
| 56 | ADD_ZERO_CONFIGURE_ARGS += \ | ||
