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/patches-openjdk-7/fix_hotspot_crosscompile.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/patches-openjdk-7/fix_hotspot_crosscompile.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-7/fix_hotspot_crosscompile.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-7/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/patches-openjdk-7/fix_hotspot_crosscompile.patch new file mode 100644 index 0000000..13c7de2 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/fix_hotspot_crosscompile.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | --- icedtea-2.6.1/acinclude.m4 | ||
2 | +++ icedtea-2.6.1/acinclude.m4 | ||
3 | @@ -906,6 +906,22 @@ | ||
4 | AC_SUBST(VERSION_SUFFIX, $version_suffix) | ||
5 | ]) | ||
6 | |||
7 | +AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD], | ||
8 | +[ | ||
9 | + AC_MSG_CHECKING(for compiler used for subsidiary programs) | ||
10 | + AC_ARG_WITH([cc-for-build], | ||
11 | + [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)], | ||
12 | + [ | ||
13 | + CC_FOR_BUILD="${withval}" | ||
14 | + ], | ||
15 | + [ | ||
16 | + CC_FOR_BUILD="\$(CC)" | ||
17 | + ]) | ||
18 | + AC_MSG_RESULT(${CC_FOR_BUILD}) | ||
19 | + AC_SUBST(CC_FOR_BUILD) | ||
20 | +]) | ||
21 | + | ||
22 | + | ||
23 | AC_DEFUN_ONCE([IT_WITH_GCJ], | ||
24 | [ | ||
25 | AC_MSG_CHECKING([whether to compile ecj natively]) | ||
26 | --- icedtea-2.6.1/configure.ac.orig 2015-07-24 09:08:33.866018127 +0200 | ||
27 | +++ icedtea-2.6.1/configure.ac 2015-07-24 09:08:40.458018002 +0200 | ||
28 | @@ -22,6 +22,8 @@ | ||
29 | AC_PROG_CC | ||
30 | AC_PROG_CXX | ||
31 | |||
32 | +AC_CHECK_WITH_CC_FOR_BUILD | ||
33 | + | ||
34 | IT_FIND_TOOLS([MAKE], [gmake make]) | ||
35 | IT_FIND_TOOL([GZIP], [gzip]) | ||
36 | IT_FIND_TOOL([ANT], [ant]) | ||
37 | --- icedtea-2.6.1/Makefile.am | ||
38 | +++ icedtea-2.6.1/Makefile.am | ||
39 | @@ -605,6 +605,7 @@ | ||
40 | FT2_LIBS="$(FREETYPE2_LIBS)" \ | ||
41 | ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ | ||
42 | HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ | ||
43 | + CC_FOR_BUILD="$(CC_FOR_BUILD)" \ | ||
44 | OE_CFLAGS="$(OE_CFLAGS)" \ | ||
45 | OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
46 | OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||