diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-02-18 00:06:46 +0100 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-02-21 12:33:11 +0100 |
commit | c79fd9b1616499dcb44e1408399cdfe54f3ccfe2 (patch) | |
tree | a5922f52eeee1a75901d757332e6b988d825cab7 /recipes/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch | |
parent | 2fd114ae2977202ca2762f6ebb9be9c5d88072e2 (diff) | |
download | openembedded-c79fd9b1616499dcb44e1408399cdfe54f3ccfe2.tar.gz |
openjdk: backport 1.11.1 release from meta-java
* shark is disabled since 1.11
* rework patches
* rework inc files for jamvm
* bump PR
Diffstat (limited to 'recipes/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch')
-rw-r--r-- | recipes/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch b/recipes/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch new file mode 100644 index 0000000000..bef699f3a7 --- /dev/null +++ b/recipes/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch @@ -0,0 +1,51 @@ +Index: icedtea6/acinclude.m4 +=================================================================== +--- icedtea6.orig/acinclude.m4 2011-12-20 02:25:50.000000000 +0100 ++++ icedtea6/acinclude.m4 2011-12-20 18:02:08.340386576 +0100 +@@ -928,6 +928,21 @@ + AC_SUBST(ALT_CACAO_SRC_DIR) + ]) + ++AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD], ++[ ++ AC_MSG_CHECKING(for compiler used for subsidiary programs) ++ AC_ARG_WITH([cc-for-build], ++ [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)], ++ [ ++ CC_FOR_BUILD="${withval}" ++ ], ++ [ ++ CC_FOR_BUILD="\$(CC)" ++ ]) ++ AC_MSG_RESULT(${CC_FOR_BUILD}) ++ AC_SUBST(CC_FOR_BUILD) ++]) ++ + AC_DEFUN([IT_WITH_GCJ], + [ + AC_MSG_CHECKING([whether to compile ecj natively]) +Index: icedtea6/Makefile.am +=================================================================== +--- icedtea6.orig/Makefile.am 2011-12-20 17:59:27.000000000 +0100 ++++ icedtea6/Makefile.am 2011-12-20 18:04:32.972312064 +0100 +@@ -538,6 +538,7 @@ + JAVAC="" \ + JAVA_HOME="" \ + JDK_HOME="" \ ++ CC_FOR_BUILD="$(CC_FOR_BUILD)" \ + OE_CFLAGS="$(OE_CFLAGS)" \ + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ +Index: icedtea6/configure.ac +=================================================================== +--- icedtea6.orig/configure.ac 2011-12-20 02:25:50.000000000 +0100 ++++ icedtea6/configure.ac 2011-12-20 18:03:04.534043885 +0100 +@@ -18,6 +18,8 @@ + AC_PROG_CC + AC_PROG_CXX + ++AC_CHECK_WITH_CC_FOR_BUILD ++ + IT_FIND_TOOL([MAKE], [make]) + IT_FIND_TOOL([GZIP], [gzip]) + IT_FIND_TOOL([ANT], [ant]) |