diff options
-rw-r--r-- | recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch | 13 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-common.inc | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch index 09db502..9a60bd6 100644 --- a/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch +++ b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch @@ -454,3 +454,16 @@ index 2021434..9035da7 100644 -I$(SHARE_SRC)/native/$(PKGDIR)/image \ -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ +diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile +index 1fa311d..f3d06ad 100644 +--- openjdk/jdk/make/sun/xawt/Makefile ++++ openjdk/jdk/make/sun/xawt/Makefile +@@ -232,7 +232,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt + + $(SIZERS): $(SIZERS_C) + $(prep-target) +- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c ++ $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -o $@ $(SIZER)$(suffix $@).c + + $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) + $(prep-target) diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index a993ea0..9c746de 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc @@ -72,6 +72,6 @@ export WANT_LLVM_RELEASE = "2.8" export LLVM_CONFIGURE_ARCH="${@get_llvm_configure_arch(d)}" # Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152 -L ${STAGING_DIR_TARGET} -E LD_LIBRARY_PATH=${STAGING_BASELIBDIR}" +QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152" EXTRA_OEMAKE += 'QEMU="${QEMU}"' |