From 7b66b4940804b72150b33248b16b582ae6a48751 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 1 Oct 2013 21:40:30 -0700 Subject: openjdk-7-25b30: Forward port ppc patches openjdk-7 update needed this patch to be reworked Signed-off-by: Khem Raj --- .../icedtea-jdk-nio-use-host-cc.patch | 60 ++++++++-------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch index 6b14673..94416bb 100644 --- a/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch +++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-jdk-nio-use-host-cc.patch @@ -1,17 +1,17 @@ -diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile -index 7906531..afa5d46 100644 ---- openjdk/jdk/make/java/nio/Makefile -+++ openjdk/jdk/make/java/nio/Makefile -@@ -823,7 +823,7 @@ $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC) +Index: openjdk/jdk/make/java/nio/Makefile +=================================================================== +--- openjdk/jdk/make/java/nio/Makefile 2013-10-01 21:20:11.000000000 -0700 ++++ openjdk/jdk/make/java/nio/Makefile 2013-10-01 21:30:40.901837422 -0700 +@@ -918,7 +918,7 @@ + ifeq ($(PLATFORM), macosx) + NIO_CC=$(HOST_CC) + else +- NIO_CC=$(CC) ++ NIO_CC=$(CC_FOR_BUILD) + endif $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) - $(prep-target) -- ($(CD) $(TEMPDIR); $(CC) $(CPPFLAGS) $(LDDFLAGS) \ -+ ($(CD) $(TEMPDIR); $(CC_FOR_BUILD) $(CPPFLAGS) $(LDDFLAGS) \ - -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC)) - - ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -@@ -834,12 +834,8 @@ else +@@ -934,12 +934,8 @@ $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE) $(prep-target) NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@ @@ -24,16 +24,7 @@ index 7906531..afa5d46 100644 # # Generated sun.nio.cs SingleByte classes # -@@ -863,7 +859,7 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \ - - $(GENUC_EXE) : $(GENUC_SRC) - $(prep-target) -- $(CC) $(CPPFLAGS) -o $@ $(GENUC_SRC) -+ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(GENUC_SRC) - - ifdef NIO_PLATFORM_CLASSES_ROOT_DIR - $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java -@@ -873,12 +869,8 @@ else +@@ -973,12 +969,8 @@ $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE) $(prep-target) NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@ @@ -46,16 +37,7 @@ index 7906531..afa5d46 100644 GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c -@@ -889,7 +881,7 @@ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \ - - $(GENSC_EXE) : $(GENSC_SRC) - $(prep-target) -- $(CC) $(CPPFLAGS) -o $@ $(GENSC_SRC) -+ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(GENSC_SRC) - - ifdef NIO_PLATFORM_CLASSES_ROOT_DIR - $(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java -@@ -899,11 +891,7 @@ else +@@ -999,11 +991,7 @@ $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE) $(prep-target) NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@ @@ -67,9 +49,11 @@ index 7906531..afa5d46 100644 -endif .PHONY: sources ---- openjdk/jdk/make/sun/Makefile.khem 2012-08-10 19:32:40.695550897 -0700 -+++ openjdk/jdk/make/sun/Makefile 2012-08-10 19:33:39.195550853 -0700 -@@ -55,7 +55,7 @@ ifneq ($(PLATFORM), windows) +Index: openjdk/jdk/make/sun/Makefile +=================================================================== +--- openjdk/jdk/make/sun/Makefile 2013-07-25 09:10:09.000000000 -0700 ++++ openjdk/jdk/make/sun/Makefile 2013-10-01 21:32:01.625839149 -0700 +@@ -55,7 +55,7 @@ endif endif HEADLESS_SUBDIR = headless @@ -77,11 +61,11 @@ index 7906531..afa5d46 100644 + XAWT_SUBDIR = endif - ifndef OPENJDK -@@ -79,7 +79,7 @@ else + ifeq ($(PLATFORM), macosx) +@@ -87,7 +87,7 @@ endif SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ - $(DISPLAY_LIBS) $(DGA_SUBDIR) \ + $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \ - jawt font jpeg cmm $(DISPLAY_TOOLS) beans + font jpeg cmm $(DISPLAY_TOOLS) beans SUBDIRS_management = management -- cgit v1.2.3-54-g00ecf From 83096c2ebba8e17cde48058931caa1211fa8c080 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 25 Feb 2014 17:38:30 +0100 Subject: openjdk-7-release-25b30.inc: move nio patch to main section. Signed-off-by: Koen Kooi --- recipes-core/openjdk/openjdk-7-release-25b30.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc index 11dce64..f5239d3 100644 --- a/recipes-core/openjdk/openjdk-7-release-25b30.inc +++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc @@ -78,14 +78,13 @@ ICEDTEAPATCHES = "\ file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \ file://icedtea-corba-parallel-make.patch;apply=no \ file://icedtea-zero-hotspotfix.patch;apply=no \ + file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ " ICEDTEAPATCHES_append_powerpc = " \ - file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " ICEDTEAPATCHES_append_powerpc64 = " \ - file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ " ICEDTEAPATCHES_append_libc-uclibc = " \ @@ -108,6 +107,7 @@ DISTRIBUTION_PATCHES = "\ patches/icedtea-shark-arm-linux-cpu-detection.patch \ patches/icedtea-corba-parallel-make.patch \ patches/icedtea-zero-hotspotfix.patch \ + patches/icedtea-jdk-nio-use-host-cc.patch \ " DISTRIBUTION_PATCHES_append_libc-uclibc = "\ @@ -122,12 +122,10 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ " DISTRIBUTION_PATCHES_append_powerpc = " \ - patches/icedtea-jdk-nio-use-host-cc.patch \ patches/icedtea-jdk-ppc64-jvm-cfg.patch \ patches/icedtea-jdk-powerpc-atomic64.patch \ " DISTRIBUTION_PATCHES_append_powerpc64 = " \ - patches/icedtea-jdk-nio-use-host-cc.patch \ patches/icedtea-jdk-ppc64-jvm-cfg.patch \ " export DISTRIBUTION_PATCHES -- cgit v1.2.3-54-g00ecf From cd63c72ac0f99013de03e9eb9f59f930364ee869 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 25 Feb 2014 17:55:57 +0100 Subject: openjdk-7-release-25b30.inc: add patch to fix hotstop build When using --enable-zero=no the build will fail without this patch. Signed-off-by: Koen Kooi --- .../icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch | 13 +++++++++++++ recipes-core/openjdk/openjdk-7-release-25b30.inc | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch diff --git a/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch new file mode 100644 index 0000000..3f7d70a --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-25b30/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch @@ -0,0 +1,13 @@ +diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile +index 898272e..c5ca547 100644 +--- openjdk/jdk/make/java/nio/Makefile ++++ openjdk/jdk/make/java/nio/Makefile +@@ -48,6 +48,8 @@ include FILES_java.gmk + include FILES_c.gmk + include Exportedfiles.gmk + ++NIO_PLATFORM_CLASSES_ROOT_DIR = ++ + ifeq ($(PLATFORM), windows) + FILES_java += \ + sun/nio/ch/Iocp.java \ diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc index f5239d3..ccb6381 100644 --- a/recipes-core/openjdk/openjdk-7-release-25b30.inc +++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc @@ -79,6 +79,7 @@ ICEDTEAPATCHES = "\ file://icedtea-corba-parallel-make.patch;apply=no \ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ + file://icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch;apply=no \ " ICEDTEAPATCHES_append_powerpc = " \ file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ @@ -108,6 +109,7 @@ DISTRIBUTION_PATCHES = "\ patches/icedtea-corba-parallel-make.patch \ patches/icedtea-zero-hotspotfix.patch \ patches/icedtea-jdk-nio-use-host-cc.patch \ + patches/icedtea-unset-NIO_PLATFORM_CLASSES_ROOT_DIR.patch \ " DISTRIBUTION_PATCHES_append_libc-uclibc = "\ -- cgit v1.2.3-54-g00ecf From da10d6ec7c576c3b31af76aecb01e2da07a48df6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 5 Sep 2013 14:37:59 -0700 Subject: libmatthew: Remove the dummy jar symlink This symlink is made to make the java-library class happy but it makes no sense to package it up in any package since it does not belong anywhere so lets delete it Signed-off-by: Khem Raj --- recipes-core/libmatthew/libmatthew.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-core/libmatthew/libmatthew.inc b/recipes-core/libmatthew/libmatthew.inc index d0ea00a..b7e50bd 100644 --- a/recipes-core/libmatthew/libmatthew.inc +++ b/recipes-core/libmatthew/libmatthew.inc @@ -46,6 +46,9 @@ do_install() { oe_libinstall -so libunix-java ${D}${libdir_jni} } +do_install_append() { + rm ${D}${datadir_java}/${PN}.jar +} PACKAGES = "\ libcgi-java libcgi-jni libcgi-jni-dbg \ libunixsocket-java libunixsocket-jni libunixsocket-jni-dbg \ -- cgit v1.2.3-54-g00ecf From a664d984e31223b36aff7033bd07e6cf25dedca1 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 28 Feb 2014 09:08:12 +0100 Subject: openjdk6: update icedtea 1.12 to version 1.12.8 --- .../openjdk-6-6b27/icedtea-crosscompile-fix.patch | 456 +++++++++++++++++++++ .../openjdk-6-6b27/icedtea-disable-sane-alsa.patch | 34 ++ recipes-core/openjdk/openjdk-6-common.inc | 1 + recipes-core/openjdk/openjdk-6-release-6b27.inc | 8 +- recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb | 6 - recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb | 6 + 6 files changed, 503 insertions(+), 8 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch delete mode 100644 recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb create mode 100644 recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch new file mode 100644 index 0000000..09db502 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch @@ -0,0 +1,456 @@ +diff --git openjdk/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk +index f308203..5ba15dc 100644 +--- openjdk/corba/make/common/Defs-linux.gmk ++++ openjdk/corba/make/common/Defs-linux.gmk +@@ -82,9 +82,9 @@ CC_LOWER_OPT = -O2 + CC_NO_OPT = + + ifeq ($(PRODUCT), java) +- _OPT = $(CC_HIGHER_OPT) ++ _OPT = $(OE_CFLAGS) + else +- _OPT = $(CC_LOWER_OPT) ++ _OPT = $(OE_CFLAGS) + CPPFLAGS_DBG += -DLOGGING + endif + +@@ -94,7 +94,7 @@ endif + # as the default. + CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN ++CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_hppa += + CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +@@ -221,7 +221,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) + # + # -L paths for finding and -ljava + # +-LDFLAGS_OPT = -Xlinker -O1 ++LDFLAGS_OPT = $(OE_LDFLAGS) + LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) + LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) + +diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make +index 4ba1f0e..48cfb02 100644 +--- openjdk/hotspot/make/linux/makefiles/buildtree.make ++++ openjdk/hotspot/make/linux/makefiles/buildtree.make +@@ -380,7 +380,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java + echo "rm -f Queens.class"; \ + echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ + echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ +- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ ++ echo 'echo Silently skipping the execution of the gamma program'; \ + ) > $@ + $(QUIETLY) chmod +x $@ + +diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +index 11de79a..c5751b2 100644 +--- openjdk/hotspot/make/linux/makefiles/gcc.make ++++ openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) + CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) + + # The flags to use for an Optimized g++ build +-OPT_CFLAGS += -O3 ++OPT_CFLAGS += $(OE_CFLAGS) + + # Hotspot uses very unstrict aliasing turn this optimization off + OPT_CFLAGS += -fno-strict-aliasing +@@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax + endif + + # Enable linker optimization +-LFLAGS += -Xlinker -O1 ++LFLAGS += $(OE_LDFLAGS) + + # If this is a --hash-style=gnu system, use --hash-style=both + # The gnu .hash section won't work on some Linux systems like SuSE 10. +diff --git openjdk/hotspot/make/linux/makefiles/gcc.make.orig openjdk/hotspot/make/linux/makefiles/gcc.make.orig +index 3d6a6b7..11de79a 100644 +--- openjdk/hotspot/make/linux/makefiles/gcc.make.orig ++++ openjdk/hotspot/make/linux/makefiles/gcc.make.orig +@@ -204,7 +204,7 @@ SONAMEFLAG = -Xlinker -soname=SONAME + SHARED_FLAG = -shared + + # Keep symbols even they are not used +-AOUT_FLAGS += -export-dynamic ++AOUT_FLAGS += -Xlinker -export-dynamic + + #------------------------------------------------------------------------ + # Debug flags +diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make +index 18f65d9..f12a798 100644 +--- openjdk/hotspot/make/linux/makefiles/jsig.make ++++ openjdk/hotspot/make/linux/makefiles/jsig.make +@@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig + # cause problems with interposing. See CR: 6466665 + # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) + +-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) ++LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS) + + # DEBUG_BINARIES overrides everything, use full -g debug information + ifeq ($(DEBUG_BINARIES), true) +diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make +index c5cf503..ae7af2e 100644 +--- openjdk/hotspot/make/linux/makefiles/launcher.make ++++ openjdk/hotspot/make/linux/makefiles/launcher.make +@@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT) + LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) + else + LAUNCHER.o = launcher.o +- LFLAGS_LAUNCHER += -L `pwd` ++ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) + LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ + ifeq ($(SHARK_BUILD), true) + LFLAGS_LAUNCHER += $(LLVM_LDFLAGS) +diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make +index cd8d9ef..b00ce46 100644 +--- openjdk/hotspot/make/linux/makefiles/vm.make ++++ openjdk/hotspot/make/linux/makefiles/vm.make +@@ -242,6 +242,7 @@ ifeq ($(SHARK_BUILD), true) + LIBS_VM += $(LLVM_LIBS) + endif + ++LFLAGS_VM += $(OE_LDFLAGS) + LINK_VM = $(LINK_LIB.c) + + # rule for building precompiled header +diff --git openjdk/hotspot/make/linux/makefiles/vm.make.orig openjdk/hotspot/make/linux/makefiles/vm.make.orig +index fa4116a..cd8d9ef 100644 +--- openjdk/hotspot/make/linux/makefiles/vm.make.orig ++++ openjdk/hotspot/make/linux/makefiles/vm.make.orig +@@ -143,13 +143,15 @@ COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto + COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt + COMPILER2_PATHS += $(GENERATED)/adfiles + ++SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark ++ + # Include dirs per type. + Src_Dirs/CORE := $(CORE_PATHS) + Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) + Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) + Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) + Src_Dirs/ZERO := $(CORE_PATHS) +-Src_Dirs/SHARK := $(CORE_PATHS) ++Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) + Src_Dirs := $(Src_Dirs/$(TYPE)) + + COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* +diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk +index 4e31797..03a84dd 100644 +--- openjdk/jdk/make/common/Defs-linux.gmk ++++ openjdk/jdk/make/common/Defs-linux.gmk +@@ -89,9 +89,9 @@ HPIS = native + + ifndef OPTIMIZATION_LEVEL + ifeq ($(PRODUCT), java) +- OPTIMIZATION_LEVEL = HIGHER ++ OPTIMIZATION_LEVEL = $(OE_CFLAGS) + else +- OPTIMIZATION_LEVEL = LOWER ++ OPTIMIZATION_LEVEL = $(OE_CFLAGS) + endif + endif + +@@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) + # as the default. + CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN ++CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_hppa += + CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +@@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) + # + # -L paths for finding and -ljava + # +-LDFLAGS_OPT = -Xlinker -O1 ++LDFLAGS_OPT = $(OE_LDFLAGS) + LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) + LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) + +diff --git openjdk/jdk/make/common/Defs-linux.gmk.orig openjdk/jdk/make/common/Defs-linux.gmk.orig +index cbbf647..4e31797 100644 +--- openjdk/jdk/make/common/Defs-linux.gmk.orig ++++ openjdk/jdk/make/common/Defs-linux.gmk.orig +@@ -86,18 +86,22 @@ HPIS = native + # + # Default optimization + # +-CC_HIGHEST_OPT = -O3 +-CC_HIGHER_OPT = -O3 +-CC_LOWER_OPT = -O2 +-CC_NO_OPT = + +-ifeq ($(PRODUCT), java) +- _OPT = $(CC_HIGHER_OPT) +-else +- _OPT = $(CC_LOWER_OPT) +- CPPFLAGS_DBG += -DLOGGING ++ifndef OPTIMIZATION_LEVEL ++ ifeq ($(PRODUCT), java) ++ OPTIMIZATION_LEVEL = HIGHER ++ else ++ OPTIMIZATION_LEVEL = LOWER ++ endif + endif + ++CC_OPT/NONE = ++CC_OPT/LOWER = -O2 ++CC_OPT/HIGHER = -O3 ++CC_OPT/HIGHEST = -O3 ++ ++CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) ++ + # For all platforms, do not omit the frame pointer register usage. + # We need this frame pointer to make it easy to walk the stacks. + # This should be the default on X86, but ia64 and amd64 may not have this +@@ -131,17 +135,13 @@ else + LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) + endif + +-# Add in platform specific optimizations for all opt levels +-CC_HIGHEST_OPT += $(_OPT_$(ARCH)) +-CC_HIGHER_OPT += $(_OPT_$(ARCH)) +-CC_LOWER_OPT += $(_OPT_$(ARCH)) +- +-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off +-ifdef NO_OPTIMIZATIONS +- CC_HIGHEST_OPT = $(CC_NO_OPT) +- CC_HIGHER_OPT = $(CC_NO_OPT) +- CC_LOWER_OPT = $(CC_NO_OPT) ++# If this is a --hash-style=gnu system, use --hash-style=both ++# The gnu .hash section won't work on some Linux systems like SuSE 10. ++_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu') ++ifneq ($(_HAS_HASH_STYLE_GNU),) ++ LDFLAGS_HASH_STYLE = -Wl,--hash-style=both + endif ++LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE) + + # + # Selection of warning messages +@@ -188,19 +188,19 @@ ifeq ($(DEBUG_BINARIES), true) + CFLAGS_REQUIRED += $(DEBUG_FLAG) + endif + +-CFLAGS_OPT = $(POPT) ++CFLAGS_OPT = $(CC_OPT) + CFLAGS_DBG = $(DEBUG_FLAG) + CFLAGS_COMMON += $(CFLAGS_REQUIRED) + + CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) +-CXXFLAGS_OPT = $(POPT) ++CXXFLAGS_OPT = $(CC_OPT) + CXXFLAGS_DBG = $(DEBUG_FLAG) + CXXFLAGS_COMMON += $(CFLAGS_REQUIRED) + + # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java + ifeq ($(FASTDEBUG), true) +- CFLAGS_DBG += $(CC_LOWER_OPT) +- CXXFLAGS_DBG += $(CC_LOWER_OPT) ++ CFLAGS_DBG += $(CC_OPT/LOWER) ++ CXXFLAGS_DBG += $(CC_OPT/LOWER) + endif + + CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' +@@ -221,6 +221,9 @@ endif + + CPPFLAGS_OPT = + CPPFLAGS_DBG = -DDEBUG ++ifneq ($(PRODUCT), java) ++ CPPFLAGS_DBG += -DLOGGING ++endif + + ifdef LIBRARY + # Libraries need to locate other libraries at runtime, and you can tell +@@ -255,9 +258,8 @@ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) + # statically link libgcc but will print a warning with the flag. We don't + # want the warning, so check gcc version first. + # +-CC_VER_MAJOR := $(shell $(CC) -dumpversion | $(SED) 's/egcs-//' | $(CUT) -d'.' -f1) +-ifeq ("$(CC_VER_MAJOR)", "3") +-OTHER_LDFLAGS += -static-libgcc ++ifeq ($(CC_MAJORVER),3) ++ OTHER_LDFLAGS += -static-libgcc + endif + + # Automatic precompiled header option to use (if COMPILE_APPROACH=batch) +diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile +index e462fba..76b56be 100644 +--- openjdk/jdk/make/sun/awt/Makefile ++++ openjdk/jdk/make/sun/awt/Makefile +@@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows) + # + + ifeq ($(PLATFORM), linux) +-CPPFLAGS += -I$(MOTIF_DIR)/include \ +- -I$(OPENWIN_HOME)/include \ +- -I$(OPENWIN_HOME)/include/X11/extensions \ +- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font ++#CPPFLAGS += -I$(MOTIF_DIR)/include \ ++# -I$(OPENWIN_HOME)/include \ ++# -I$(OPENWIN_HOME)/include/X11/extensions \ ++CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font + endif + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ +@@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + $(EVENT_MODEL) + + ifeq ($(PLATFORM), linux) +-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) ++#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) + endif + + LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ +diff --git openjdk/jdk/make/sun/awt/Makefile.orig openjdk/jdk/make/sun/awt/Makefile.orig +index 61f36cd..e462fba 100644 +--- openjdk/jdk/make/sun/awt/Makefile.orig ++++ openjdk/jdk/make/sun/awt/Makefile.orig +@@ -28,17 +28,13 @@ PACKAGE = sun.awt + LIBRARY = awt + PRODUCT = sun + +-# + # Tell Defs.gmk that VIS is needed +-# + VIS_NEEDED=true + +-include $(BUILDDIR)/common/Defs.gmk +- +-# + # Use highest optimization level +-# +-_OPT = $(CC_HIGHEST_OPT) ++OPTMIZATION_LEVEL = HIGHEST ++ ++include $(BUILDDIR)/common/Defs.gmk + + OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES + +@@ -388,6 +384,10 @@ _FONTCONFIGS = \ + fontconfig.SuSE.properties \ + fontconfig.Ubuntu.properties \ + fontconfig.Fedora.properties \ ++ fontconfig.Fedora.9.properties \ ++ fontconfig.Fedora.10.properties \ ++ fontconfig.Fedora.11.properties \ ++ fontconfig.Fedora.12.properties \ + fontconfig.RedHat.6.properties \ + fontconfig.Gentoo.properties + else +diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk +index 44de692..9ce661c 100644 +--- openjdk/jdk/make/sun/awt/mawt.gmk ++++ openjdk/jdk/make/sun/awt/mawt.gmk +@@ -196,8 +196,8 @@ endif + CPPFLAGS += -I$(CUPS_HEADERS_PATH) + + ifndef HEADLESS +-CPPFLAGS += -I$(OPENWIN_HOME)/include +-LDFLAGS += -L$(OPENWIN_LIB) ++#CPPFLAGS += -I$(OPENWIN_HOME)/include ++#LDFLAGS += -L$(OPENWIN_LIB) + + endif # !HEADLESS + +@@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + + ifeq ($(PLATFORM), linux) + # Checking for the X11/extensions headers at the additional location +- CPPFLAGS += -I/X11R6/include/X11/extensions \ +- -I/usr/include/X11/extensions ++# CPPFLAGS += -I/X11R6/include/X11/extensions \ ++# -I/usr/include/X11/extensions + endif + + ifeq ($(PLATFORM), solaris) +diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile +index 4b4c782..440699b 100644 +--- openjdk/jdk/make/sun/xawt/Makefile ++++ openjdk/jdk/make/sun/xawt/Makefile +@@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ + -I$(PLATFORM_SRC)/native/sun/awt + + ifeq ($(PLATFORM), linux) ++# Very unsuitable for cross-compilation. + # Allows for builds on Debian GNU Linux, X11 is in a different place +- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ +- -I/usr/include/X11/extensions \ +- -I$(MOTIF_DIR)/include \ +- -I$(OPENWIN_HOME)/include ++# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ ++# -I/usr/include/X11/extensions \ ++# -I$(MOTIF_DIR)/include \ ++# -I$(OPENWIN_HOME)/include + endif + + ifeq ($(PLATFORM), solaris) +@@ -250,7 +251,7 @@ $(SIZES): $(SIZERS) + $(CHMOD) +w $@;\ + else \ + $(ECHO) GENERATING $@; \ +- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ + fi + @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ + $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile +index 6693e2a..494a646 100644 +--- openjdk/jdk/make/sun/splashscreen/Makefile ++++ openjdk/jdk/make/sun/splashscreen/Makefile +@@ -63,8 +63,8 @@ CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE + + ifneq ($(PLATFORM), windows) + CFLAGS += -DWITH_X11 +- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions +- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread ++ #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions ++ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread + else # PLATFORM + CFLAGS += -DWITH_WIN32 + OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib +diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile +index 440699b..1fa311d 100644 +--- openjdk/jdk/make/sun/xawt/Makefile ++++ openjdk/jdk/make/sun/xawt/Makefile +@@ -46,7 +46,7 @@ include FILES_export_unix.gmk + AUTO_FILES_JAVA_DIRS = sun/awt/X11 + AUTO_JAVA_PRUNE = WrapperGenerator.java + +-LDFLAGS += -L$(OPENWIN_LIB) ++#LDFLAGS += -L$(OPENWIN_LIB) + + # For Xrender extension. + ifeq ($(PLATFORM), solaris) +diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher +index f59a9d6..6edc880 100644 +--- openjdk/jdk/make/launchers/Makefile.launcher ++++ openjdk/jdk/make/launchers/Makefile.launcher +@@ -152,7 +152,7 @@ endif + ifeq ($(GUI_TOOL),true) + ifneq ($(PLATFORM), windows) + # Anything with a GUI needs X11 to be linked in. +- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 ++ OTHER_LDLIBS += -lX11 + endif + endif + +diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile +index 2021434..9035da7 100644 +--- openjdk/jdk/make/sun/jawt/Makefile ++++ openjdk/jdk/make/sun/jawt/Makefile +@@ -98,8 +98,7 @@ else # PLATFORM + # + # Other extra flags needed for compiling. + # +-CPPFLAGS += -I$(OPENWIN_HOME)/include \ +- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ ++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(SHARE_SRC)/native/$(PKGDIR)/image \ + -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ + -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch new file mode 100644 index 0000000..0d3ce04 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch @@ -0,0 +1,34 @@ +diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk +index 55c0e88..220aa5c 100644 +--- openjdk/jdk/make/common/shared/Sanity.gmk ++++ openjdk/jdk/make/common/shared/Sanity.gmk +@@ -102,11 +102,6 @@ ifeq ($(PLATFORM), linux) + if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \ + $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \ + fi) +- ALSA_INCLUDE=/usr/include/alsa/version.h +- ALSA_LIBRARY=/usr/lib/libasound.so +- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ +- $(SED) -e 's@.*\"\(.*\)\".*@\1@' ) +- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) + endif + + ifeq ($(PLATFORM), windows) +@@ -210,7 +210,6 @@ endif + sane-compiler \ + sane-link \ + sane-cacerts \ +- sane-alsa-headers \ + sane-ant_version \ + sane-zip_version \ + sane-unzip_version \ +@@ -1351,9 +1346,6 @@ endif + # need /usr/include/alsa/version.h and /usr/lib/libasound.so + ###################################################### + +-ifdef REQUIRED_ALSA_VERSION +- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION)) +-endif + sane-alsa-headers: + ifdef REQUIRED_ALSA_VERSION + @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index e85f692..f900362 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc @@ -290,6 +290,7 @@ FILES_${JDKPN}-dbg = "\ ${JDK_HOME}/jre/lib/.debug \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \ + ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \ ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \ diff --git a/recipes-core/openjdk/openjdk-6-release-6b27.inc b/recipes-core/openjdk/openjdk-6-release-6b27.inc index 59b36d9..eddb4e4 100644 --- a/recipes-core/openjdk/openjdk-6-release-6b27.inc +++ b/recipes-core/openjdk/openjdk-6-release-6b27.inc @@ -22,6 +22,10 @@ SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd" SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" -ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no" +ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ + file://icedtea-disable-sane-alsa.patch;apply=no \ + " -DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch" +DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch \ + patches/icedtea-disable-sane-alsa.patch \ + " diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb deleted file mode 100644 index 9660a15..0000000 --- a/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -require openjdk-6-release-6b27.inc - -PR = "${INC_PR}.2" - -SRC_URI[iced.md5sum] = "2299fde9f315c7feb561c2975aa232b1" -SRC_URI[iced.sha256sum] = "c61d6eb2f98d5c4059bb6eb6d808dd0954cf7d35c14290e5c77c3d7db75d2b35" diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb new file mode 100644 index 0000000..8d12a8e --- /dev/null +++ b/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb @@ -0,0 +1,6 @@ +require openjdk-6-release-6b27.inc + +PR = "${INC_PR}.4" + +SRC_URI[iced.md5sum] = "7712c4b3b9f8092aa8c7b5cad0b46d06" +SRC_URI[iced.sha256sum] = "c2ad74af29af774f778675d3fde952f4defebb2be44f565253d788e2e7af39d4" -- cgit v1.2.3-54-g00ecf From 6c01d9fa201b5578d64650c0fdab1c13a82a0c42 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 1 Mar 2014 21:40:46 +0100 Subject: openjdk-common.inc: fix qemu usage * compile all binaries, which are executed by qemu, with the static compilerflag, because of a memleak inside qemu * remove lib- and ld-path for qemu usage, because all binaries are compiled static now, openjdk7 seems to compile fine anyway --- .../openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch | 13 +++++++++++++ recipes-core/openjdk/openjdk-common.inc | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) 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}"' -- cgit v1.2.3-54-g00ecf From 967975bbceaa6cd47862c23de0fb2d3f3d439f3e Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 5 Mar 2014 06:13:03 +0100 Subject: cacao: fix target compilation and packaging --- recipes-core/cacao/cacao_1.6.1.bb | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb index 006ee02..4ad81db 100644 --- a/recipes-core/cacao/cacao_1.6.1.bb +++ b/recipes-core/cacao/cacao_1.6.1.bb @@ -15,8 +15,8 @@ SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao- SRC_URI[md5sum] = "2c18478404afd1cffdd15ad1e9d85a57" SRC_URI[sha256sum] = "eecc8bd1b528a028f43d9d1d0c06b97855bbf1d40e03826d911ebbc0b6971e12" -inherit java autotools update-alternatives -# --with-vm-zip=${datadir}/cacao/vm.zip +inherit java autotools update-alternatives pkgconfig + EXTRA_OECONF_class-native = "\ --enable-debug \ --with-vm-zip=${datadir}/cacao/vm.zip \ @@ -35,14 +35,31 @@ EXTRA_OECONF_class-native = "\ CACHED_CONFIGUREVARS_class-native += "ac_cv_prog_JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial" +EXTRA_OECONF = "\ + --with-vm-zip=${datadir}/cacao/vm.zip \ + --disable-libjvm \ + \ + --with-build-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \ + --with-jni_h=${STAGING_INCDIR}/classpath \ + --with-jni_md_h=${STAGING_INCDIR}/classpath \ + \ + --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ + --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \ + --disable-test-dependency-checks \ +" + do_configure_prepend () { rm src/mm/boehm-gc/ltmain.sh mkdir -p src/mm/boehm-gc/m4 } -#FILES_${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}" -#FILES_${PN}-doc = "${datadir}/man" -#FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*" +do_install_append () { + rm ${D}/${bindir}/java +} + +FILES_${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}" +FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*" +FILES_${PN}-doc += "${datadir}/gc" ALTERNATIVE_NAME = "java" ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}" -- cgit v1.2.3-54-g00ecf From 79cab490738d10cdfd9dbfe06ed3a814f787667a Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 8 Mar 2014 01:00:01 +0100 Subject: README: update for icedtea version 1.12.8 --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index a8e4eac..225ee44 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" For openjdk6: PREFERRED_VERSION_openjdk-6-jre = "6b24-1.11.9" or -PREFERRED_VERSION_openjdk-6-jre = "6b27-1.12.5" +PREFERRED_VERSION_openjdk-6-jre = "6b27-1.12.8" PREFERRED_VERSION_icedtea6-native = "1.8.11" For openjdk7: -- cgit v1.2.3-54-g00ecf From 665ab3a5dac364a25538d4f2df6424a96ce061f4 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 8 Mar 2014 01:01:57 +0100 Subject: jamvm: add inherit pkgconfig --- recipes-core/jamvm/jamvm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index da194f7..6e1a707 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -21,7 +21,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ " -inherit java autotools update-alternatives +inherit java autotools update-alternatives pkgconfig # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -- cgit v1.2.3-54-g00ecf From 83b6a83bf5bc5a44b56eefafbe368fffd066f8e2 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 8 Mar 2014 01:03:19 +0100 Subject: jamvm: update git version to ebd11bde0a97b57f0d18938c6b65468d3c932719 * remove annotations.patch, because it was fixed upstream --- recipes-core/jamvm/jamvm/annotations.patch | 31 ------------------------------ recipes-core/jamvm/jamvm_git.bb | 3 +-- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 recipes-core/jamvm/jamvm/annotations.patch diff --git a/recipes-core/jamvm/jamvm/annotations.patch b/recipes-core/jamvm/jamvm/annotations.patch deleted file mode 100644 index 6279366..0000000 --- a/recipes-core/jamvm/jamvm/annotations.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: git/src/classlib/gnuclasspath/annotations.c -=================================================================== ---- git.orig/src/classlib/gnuclasspath/annotations.c 2013-07-29 10:44:38.597241346 +0000 -+++ git/src/classlib/gnuclasspath/annotations.c 2013-07-29 11:03:42.927744962 +0000 -@@ -247,7 +247,7 @@ - return anno; - } - --Object *parseAnnotations(Class *class, AnnotationData *annotations) { -+Object *parseAnnotations(Class *class, AttributeData *annotations) { - if(!anno_inited && !initAnnotation()) - return NULL; - -@@ -290,7 +290,7 @@ - } - - Object *getMethodParameterAnnotations(MethodBlock *mb) { -- AnnotationData *annotations; -+ AttributeData *annotations; - Object **outer_array_data; - Object *outer_array; - int no_params, i; -@@ -342,7 +342,7 @@ - } - - Object *getMethodDefaultValue(MethodBlock *mb) { -- AnnotationData *annotations; -+ AttributeData *annotations; - - if(!anno_inited && !initAnnotation()) - return NULL; diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index 97ed1cc..bfa856a 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb @@ -3,14 +3,13 @@ require jamvm.inc -SRCREV = "ac22c9948434e528ece451642b4ebde40953ee7e" +SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719" PV = "1.5.5+1.6.0-devel+git${SRCPV}" SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ file://jamvm-jni_h-noinst.patch \ file://libffi.patch \ file://jamvm-minmax-heap.patch \ - file://annotations.patch \ file://java \ " -- cgit v1.2.3-54-g00ecf From 07f90e1615457edcadd2d9412048695823290f80 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 6 Apr 2014 21:47:34 +0200 Subject: java-test-image: add jamvm, cacao and classpath --- recipes-images/images/java-test-image.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-images/images/java-test-image.bb b/recipes-images/images/java-test-image.bb index b4eeb83..4807858 100644 --- a/recipes-images/images/java-test-image.bb +++ b/recipes-images/images/java-test-image.bb @@ -10,4 +10,10 @@ IMAGE_INSTALL = "busybox modutils-initscripts initscripts opkg udev sysvinit net openjdk-7-jre openjdk-7-vm-jamvm openjdk-7-vm-cacao \ openjdk-6-jre openjdk-6-vm-zero openjdk-6-vm-jamvm openjdk-6-vm-cacao \ strace dropbear binutils \ + classpath \ + classpath-common \ + classpath-examples \ + classpath-tools \ + jamvm \ + cacao \ " -- cgit v1.2.3-54-g00ecf From d86d17c9d13d1117b484cb36f884709ce585a3e0 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 12 Apr 2014 22:32:00 +0200 Subject: jamvm: update git url to sourceforge while berlios is gone --- recipes-core/jamvm/jamvm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index bfa856a..07eed6a 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb @@ -6,7 +6,7 @@ require jamvm.inc SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719" PV = "1.5.5+1.6.0-devel+git${SRCPV}" -SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ +SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \ file://jamvm-jni_h-noinst.patch \ file://libffi.patch \ file://jamvm-minmax-heap.patch \ -- cgit v1.2.3-54-g00ecf From 3055f40a915e6d1bdc7a031ec6f8894b31ea5162 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 19 Jul 2014 13:57:48 +0200 Subject: openjdk6: add version 1.13.4 --- .../openjdk/openjdk-6-6b32/build-hacks.patch | 119 +++++++++ .../openjdk-6-6b32/icedtea-crosscompile-fix.patch | 280 +++++++++++++++++++++ .../openjdk-6-6b32/icedtea-disable-sane-alsa.patch | 12 + .../openjdk-6-6b32/icedtea-hostbuildcc.patch | 12 + .../icedtea-jdk-rmi-crosscompile.patch | 13 + .../openjdk-6-6b32/icedtea-remove_werror.patch | 16 ++ .../openjdk-6-6b32/icedtea-zero-hotspotfix.patch | 41 +++ recipes-core/openjdk/openjdk-6-release-6b32.inc | 27 ++ recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb | 6 + 9 files changed, 526 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch create mode 100644 recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch create mode 100644 recipes-core/openjdk/openjdk-6-release-6b32.inc create mode 100644 recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb diff --git a/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch new file mode 100644 index 0000000..93ca65d --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch @@ -0,0 +1,119 @@ +Index: icedtea6-1.13.3/Makefile.am +=================================================================== +--- icedtea6-1.13.3.orig/Makefile.am 2014-06-09 21:46:36.640603938 +0200 ++++ icedtea6-1.13.3/Makefile.am 2014-06-09 21:51:34.228435112 +0200 +@@ -795,6 +795,11 @@ + JAVAC="" \ + JAVA_HOME="" \ + JDK_HOME="" \ ++ OE_CFLAGS="$(OE_CFLAGS)" \ ++ OE_CPPFLAGS="$(OE_CPPFLAGS)" \ ++ OE_CXXFLAGS="$(OE_CXXFLAGS)" \ ++ OE_LDFLAGS="$(OE_LDFLAGS)" \ ++ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ + ANT_RESPECT_JAVA_HOME="TRUE" \ + DISTRIBUTION_ID="$(DIST_ID)" \ + DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ +@@ -2025,9 +2030,7 @@ + rm -f stamps/pax-mark-vm-debug.stamp + + stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm.stamp +- if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ +- $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ +- fi ++ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ + mkdir -p stamps + touch $@ + +@@ -2035,9 +2038,7 @@ + rm -f stamps/check-crypto.stamp + + stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-debug.stamp +- if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ +- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ +- fi ++ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ + mkdir -p stamps + touch $@ + +@@ -2219,9 +2220,7 @@ + rm -f stamps/pax-mark-vm-ecj.stamp + + stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-ecj.stamp +- if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ +- $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ +- fi ++ $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ + mkdir -p stamps + touch $@ + +@@ -2379,10 +2378,14 @@ + if BUILD_JAMVM + cd jamvm/jamvm && \ + LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ +- ./autogen.sh --with-java-runtime-library=openjdk6 \ +- --prefix=$(abs_top_builddir)/jamvm/install ; \ +- $(MAKE) ; \ +- $(MAKE) install ++ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \ ++ --prefix=$(abs_top_builddir)/jamvm/install \ ++ --host=$(host_alias) \ ++ --build=$(build_alias) \ ++ --target=$(target_alias) \ ++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ ++ $(ARCH_PREFIX) $(MAKE) ; \ ++ $(ARCH_PREFIX) $(MAKE) install + mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server + cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server + ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client +@@ -2446,6 +2449,7 @@ + --host=$(host_alias) \ + --build=$(build_alias) \ + --target=$(target_alias) \ ++ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ + --prefix=$(abs_top_builddir)/cacao/install \ + --with-java-runtime-library=openjdk \ + --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ +@@ -2514,7 +2518,7 @@ + # configure script arguments, quoted in single quotes + CONFIGURE_ARGS = @CONFIGURE_ARGS@ + ADD_ZERO_CONFIGURE_ARGS = \ +- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \ ++ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ + --enable-zero + if ADD_SHARK_BUILD + ADD_ZERO_CONFIGURE_ARGS += \ +Index: icedtea6-1.13.3/javac.in +=================================================================== +--- icedtea6-1.13.3.orig/javac.in 2014-06-09 21:46:36.640603938 +0200 ++++ icedtea6-1.13.3/javac.in 2014-06-09 21:46:36.636603946 +0200 +@@ -40,7 +40,7 @@ + { + my @new_args = @{$_[0]}; + +- for my $opt (NO_DUP_ARGS) ++ for my $opt (NO_DUP_ARGS) + { + my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; + if (@indices > 1) { +@@ -49,7 +49,7 @@ + } + } + +- for my $opt (STRIP_ARGS) ++ for my $opt (STRIP_ARGS) + { + my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; + splice @new_args, $_, 1 for @indices; +@@ -91,7 +91,10 @@ + my @CLASSPATH = ('@ECJ_JAR@'); + push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; + $ENV{"CLASSPATH"} = join ':', @CLASSPATH; +- exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; ++ ++ # Compiling hotspot-tools consumes tons of memory and exceeds any default ++ # limits for jamvm and cacao. ++ exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; + } + else + { diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch new file mode 100644 index 0000000..3b34160 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch @@ -0,0 +1,280 @@ +diff --git openjdk/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk +index f308203..5ba15dc 100644 +--- openjdk/corba/make/common/Defs-linux.gmk ++++ openjdk/corba/make/common/Defs-linux.gmk +@@ -82,9 +82,9 @@ CC_LOWER_OPT = -O2 + CC_NO_OPT = + + ifeq ($(PRODUCT), java) +- _OPT = $(CC_HIGHER_OPT) ++ _OPT = $(OE_CFLAGS) + else +- _OPT = $(CC_LOWER_OPT) ++ _OPT = $(OE_CFLAGS) + CPPFLAGS_DBG += -DLOGGING + endif + +@@ -94,7 +94,7 @@ endif + # as the default. + CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN ++CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_hppa += + CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +@@ -221,7 +221,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) + # + # -L paths for finding and -ljava + # +-LDFLAGS_OPT = -Xlinker -O1 ++LDFLAGS_OPT = $(OE_LDFLAGS) + LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) + LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) + +diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +index 11de79a..c5751b2 100644 +--- openjdk/hotspot/make/linux/makefiles/gcc.make ++++ openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) + CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) + + # The flags to use for an Optimized g++ build +-OPT_CFLAGS += -O3 ++OPT_CFLAGS += $(OE_CFLAGS) + + # Hotspot uses very unstrict aliasing turn this optimization off + OPT_CFLAGS += -fno-strict-aliasing +@@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax + endif + + # Enable linker optimization +-LFLAGS += -Xlinker -O1 ++LFLAGS += $(OE_LDFLAGS) + + # If this is a --hash-style=gnu system, use --hash-style=both + # The gnu .hash section won't work on some Linux systems like SuSE 10. +diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make +index 18f65d9..f12a798 100644 +--- openjdk/hotspot/make/linux/makefiles/jsig.make ++++ openjdk/hotspot/make/linux/makefiles/jsig.make +@@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig + # cause problems with interposing. See CR: 6466665 + # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) + +-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) ++LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS) + + # DEBUG_BINARIES overrides everything, use full -g debug information + ifeq ($(DEBUG_BINARIES), true) +diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make +index c5cf503..ae7af2e 100644 +--- openjdk/hotspot/make/linux/makefiles/launcher.make ++++ openjdk/hotspot/make/linux/makefiles/launcher.make +@@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT) + LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) + else + LAUNCHER.o = launcher.o +- LFLAGS_LAUNCHER += -L `pwd` ++ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) + LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ + ifeq ($(SHARK_BUILD), true) + LFLAGS_LAUNCHER += $(LLVM_LDFLAGS) +diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk +index 4e31797..03a84dd 100644 +--- openjdk/jdk/make/common/Defs-linux.gmk ++++ openjdk/jdk/make/common/Defs-linux.gmk +@@ -89,9 +89,9 @@ HPIS = native + + ifndef OPTIMIZATION_LEVEL + ifeq ($(PRODUCT), java) +- OPTIMIZATION_LEVEL = HIGHER ++ OPTIMIZATION_LEVEL = $(OE_CFLAGS) + else +- OPTIMIZATION_LEVEL = LOWER ++ OPTIMIZATION_LEVEL = $(OE_CFLAGS) + endif + endif + +@@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) + # as the default. + CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN ++CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_hppa += + CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +@@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) + # + # -L paths for finding and -ljava + # +-LDFLAGS_OPT = -Xlinker -O1 ++LDFLAGS_OPT = $(OE_LDFLAGS) + LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) + LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) + +diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile +index e462fba..76b56be 100644 +--- openjdk/jdk/make/sun/awt/Makefile ++++ openjdk/jdk/make/sun/awt/Makefile +@@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows) + # + + ifeq ($(PLATFORM), linux) +-CPPFLAGS += -I$(MOTIF_DIR)/include \ +- -I$(OPENWIN_HOME)/include \ +- -I$(OPENWIN_HOME)/include/X11/extensions \ +- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font ++#CPPFLAGS += -I$(MOTIF_DIR)/include \ ++# -I$(OPENWIN_HOME)/include \ ++# -I$(OPENWIN_HOME)/include/X11/extensions \ ++CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font + endif + CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ +@@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + $(EVENT_MODEL) + + ifeq ($(PLATFORM), linux) +-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) ++#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) + endif + + LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ +diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk +index 44de692..9ce661c 100644 +--- openjdk/jdk/make/sun/awt/mawt.gmk ++++ openjdk/jdk/make/sun/awt/mawt.gmk +@@ -196,8 +196,8 @@ endif + CPPFLAGS += -I$(CUPS_HEADERS_PATH) + + ifndef HEADLESS +-CPPFLAGS += -I$(OPENWIN_HOME)/include +-LDFLAGS += -L$(OPENWIN_LIB) ++#CPPFLAGS += -I$(OPENWIN_HOME)/include ++#LDFLAGS += -L$(OPENWIN_LIB) + + endif # !HEADLESS + +@@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + + ifeq ($(PLATFORM), linux) + # Checking for the X11/extensions headers at the additional location +- CPPFLAGS += -I/X11R6/include/X11/extensions \ +- -I/usr/include/X11/extensions ++# CPPFLAGS += -I/X11R6/include/X11/extensions \ ++# -I/usr/include/X11/extensions + endif + + ifeq ($(PLATFORM), solaris) +diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile +index 4b4c782..440699b 100644 +--- openjdk/jdk/make/sun/xawt/Makefile ++++ openjdk/jdk/make/sun/xawt/Makefile +@@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ + -I$(PLATFORM_SRC)/native/sun/awt + + ifeq ($(PLATFORM), linux) ++# Very unsuitable for cross-compilation. + # Allows for builds on Debian GNU Linux, X11 is in a different place +- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ +- -I/usr/include/X11/extensions \ +- -I$(MOTIF_DIR)/include \ +- -I$(OPENWIN_HOME)/include ++# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ ++# -I/usr/include/X11/extensions \ ++# -I$(MOTIF_DIR)/include \ ++# -I$(OPENWIN_HOME)/include + endif + + ifeq ($(PLATFORM), solaris) +@@ -250,7 +251,7 @@ $(SIZES): $(SIZERS) + $(CHMOD) +w $@;\ + else \ + $(ECHO) GENERATING $@; \ +- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ + fi + @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ + $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile +index 440699b..1fa311d 100644 +--- openjdk/jdk/make/sun/xawt/Makefile ++++ openjdk/jdk/make/sun/xawt/Makefile +@@ -46,7 +46,7 @@ include FILES_export_unix.gmk + AUTO_FILES_JAVA_DIRS = sun/awt/X11 + AUTO_JAVA_PRUNE = WrapperGenerator.java + +-LDFLAGS += -L$(OPENWIN_LIB) ++#LDFLAGS += -L$(OPENWIN_LIB) + + # For Xrender extension. + ifeq ($(PLATFORM), solaris) +diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher +index f59a9d6..6edc880 100644 +--- openjdk/jdk/make/launchers/Makefile.launcher ++++ openjdk/jdk/make/launchers/Makefile.launcher +@@ -152,7 +152,7 @@ endif + ifeq ($(GUI_TOOL),true) + ifneq ($(PLATFORM), windows) + # Anything with a GUI needs X11 to be linked in. +- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 ++ OTHER_LDLIBS += -lX11 + endif + endif + +diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile +index 2021434..9035da7 100644 +--- openjdk/jdk/make/sun/jawt/Makefile ++++ openjdk/jdk/make/sun/jawt/Makefile +@@ -98,8 +98,7 @@ else # PLATFORM + # + # Other extra flags needed for compiling. + # +-CPPFLAGS += -I$(OPENWIN_HOME)/include \ +- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ ++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -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 openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make +index 7271a9e..e441970 100644 +--- openjdk/hotspot/make/linux/makefiles/vm.make ++++ openjdk/hotspot/make/linux/makefiles/vm.make +@@ -290,6 +290,7 @@ ifeq ($(SHARK_BUILD), true) + LIBS_VM += $(LLVM_LIBS) + endif + ++LFLAGS_VM += $(OE_LDFLAGS) + LINK_VM = $(LINK_LIB.CC) + + # rule for building precompiled header +diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile +index d8d89aa..539854a 100644 +--- openjdk/jdk/make/sun/splashscreen/Makefile ++++ openjdk/jdk/make/sun/splashscreen/Makefile +@@ -66,8 +66,8 @@ endif + + ifneq ($(PLATFORM), windows) + CFLAGS += -DWITH_X11 +- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions +- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread ++ #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions ++ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpthread + else # PLATFORM + CFLAGS += -DWITH_WIN32 + OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch new file mode 100644 index 0000000..917a5b8 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch @@ -0,0 +1,12 @@ +diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk +index 88875b2..2ab8aaf 100644 +--- openjdk/jdk/make/common/shared/Sanity.gmk ++++ openjdk/jdk/make/common/shared/Sanity.gmk +@@ -31,6 +31,7 @@ + # Shared sanity rules for the JDK builds. + # + ++ + .SUFFIXES: .hdiffs + + # All files created during sanity checking diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch new file mode 100644 index 0000000..3d7c619 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch @@ -0,0 +1,12 @@ +diff --git openjdk/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make +index b40c081..2dfbfc8 100644 +--- openjdk/hotspot/make/linux/makefiles/rules.make ++++ openjdk/hotspot/make/linux/makefiles/rules.make +@@ -36,6 +36,7 @@ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ + # variables: $(CFLAGS), $(CXXFLAGS) and $(CPPFLAGS). + CC_COMPILE = $(CC) $(CXXFLAGS) + CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) ++CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS) + + AS.S = $(AS) $(ASFLAGS) + diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch new file mode 100644 index 0000000..55f1f9c --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch @@ -0,0 +1,13 @@ +diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile +index eaf8a6e..4938613 100644 +--- openjdk/jdk/make/com/sun/jmx/Makefile ++++ openjdk/jdk/make/com/sun/jmx/Makefile +@@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/ + # when available, we need to run with latest rmic version available. rmic + # launch tool not built at this stage but we can invoke via rmi class. + +-RMIC_JAVA = $(OUTPUTDIR)/bin/java ++RMIC_JAVA = $(BOOTDIR)/bin/java + # need to treat 64bit solaris differently + ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) + RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch new file mode 100644 index 0000000..cab80ac --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch @@ -0,0 +1,16 @@ +diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +index 8986146..846bd6b 100644 +--- openjdk/hotspot/make/linux/makefiles/gcc.make ++++ openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -132,11 +132,6 @@ else + CFLAGS += -pipe + endif + +-# Compiler warnings are treated as errors +-ifneq ($(COMPILER_WARNINGS_FATAL),false) +-WARNINGS_ARE_ERRORS = -Werror +-endif +- + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit + # conversions which might affect the values. To avoid that, we need to turn diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch new file mode 100644 index 0000000..91ace0e --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch @@ -0,0 +1,41 @@ +diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make +index c2a1484..f460d85 100644 +--- openjdk/hotspot/make/linux/makefiles/zeroshark.make ++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make +@@ -32,13 +32,20 @@ Obj_Files += cppInterpreter_arm.o + Obj_Files += thumb2.o + + CFLAGS += -DHOTSPOT_ASM ++CCFLAGS += -DHOTSPOT_ASM ++ ++ifeq ($(CROSS_COMPILATION), true) ++ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) ++else ++ C_COMPILE_FOR_MKBC = $(C_COMPILE) ++endif + + cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s + thumb2.o: offsets_arm.s + + offsets_arm.s: mkoffsets + @echo Generating assembler offsets +- ./mkoffsets > $@ ++ $(QEMU) ./mkoffsets > $@ + + bytecodes_arm.s: bytecodes_arm.def mkbc + @echo Generating ARM assembler bytecode sequences +@@ -46,12 +53,12 @@ bytecodes_arm.s: bytecodes_arm.def mkbc + + mkbc: $(GAMMADIR)/tools/mkbc.c + @echo Compiling mkbc tool +- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) ++ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) + + mkoffsets: asm_helper.cpp + @echo Compiling offset generator + $(QUIETLY) $(REMOVE_TARGET) +- $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) ++ $(CC_COMPILE) $(CFLAGS) -static -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) + + endif + diff --git a/recipes-core/openjdk/openjdk-6-release-6b32.inc b/recipes-core/openjdk/openjdk-6-release-6b32.inc new file mode 100644 index 0000000..fb7fb35 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-release-6b32.inc @@ -0,0 +1,27 @@ +require openjdk-6-release-6b27.inc + +DEPENDS += "krb5" + +FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b32:" + +EXTRA_OECONF += "--disable-downloading \ + --enable-system-zlib \ + --enable-system-jpeg \ + --enable-system-png \ + --enable-system-gif \ + " + +OPENJDK_VERSION = "b32" +OPENJDK_DATE = "15_jul_2014" +#https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-b31-15_apr_2014.tar.gz +OPENJDK_URI = "https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk;unpack=false" +SRC_URI[openjdk.md5sum] = "a97c28256a61be76e3047c31e0349c04" +SRC_URI[openjdk.sha256sum] = "fe1eb7053fddfd325152f95f9719325e4ba67534a26fa690ca24fab75461a1fa" + +JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa" +SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1" +SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc" + +JAXP_FILE = "jaxp144_04.zip" +SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd" +SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" diff --git a/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb b/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb new file mode 100644 index 0000000..69a3e1e --- /dev/null +++ b/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb @@ -0,0 +1,6 @@ +require openjdk-6-release-6b32.inc + +PR = "${INC_PR}.0" + +SRC_URI[iced.md5sum] = "95d61221d0be3616c8c04d164df524a4" +SRC_URI[iced.sha256sum] = "302b17575ad98bbf6a1d4d8768d2ea1f1b070f153c660ebe493b6509d56ed0e7" -- cgit v1.2.3-54-g00ecf From 2f36931b42201d439ad7e5e3a7657293d41b5439 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 20 Jul 2014 16:27:46 +0200 Subject: README: update openjdk6 to the latest icedtea version --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 225ee44..e21f203 100644 --- a/README +++ b/README @@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" For openjdk6: PREFERRED_VERSION_openjdk-6-jre = "6b24-1.11.9" or -PREFERRED_VERSION_openjdk-6-jre = "6b27-1.12.8" +PREFERRED_VERSION_openjdk-6-jre = "6b27-1.13.4" PREFERRED_VERSION_icedtea6-native = "1.8.11" For openjdk7: -- cgit v1.2.3-54-g00ecf From 6e648e5a616cef42d2e61ee712fcc983a8b086cd Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 20 Jul 2014 16:31:54 +0200 Subject: README: minor fixes * set the layer branches dora depends on to dora too * add libstdc++6 package as dependency for debian based distributions --- README | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README b/README index e21f203..ae345c0 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: dora revision: HEAD URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: dora revision: HEAD You should define at lease the following variables in a distro include file or local.conf @@ -40,6 +40,8 @@ BBLAYERS ?= " \ Please note that libstdc++ static is needed on your host to compile icedtea6/7-native (install libstdc++-static on a Fedora). +For debian-based distributions you need the libstdc++6-$compilerversion-dev package. + Send pull requests to openembedded-devel@lists.openembedded.org Main layer maintainers: Henning Heinold -- cgit v1.2.3-54-g00ecf From 49b063c7986e1ae1411f278af53f49f1e77349f7 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 10 Oct 2014 15:00:28 +0300 Subject: openjdk: add pkgconfig support pkgconfig is now enabled, so that pkg-config macros will not fail in configure stage. Signed-off-by: Cristian Iorga --- recipes-core/openjdk/openjdk-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index 9c746de..349ce9e 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc @@ -17,7 +17,7 @@ DEPENDS_append_libc-uclibc = " virtual/libiconv " # because structure sizes and/or alignment may differ. DEPENDS_append = " qemu-native " -inherit java autotools gettext qemu +inherit java autotools gettext qemu pkgconfig # OpenJDK uses slightly different names for certain arches. We need to know # this to create some files which are expected by the build. -- cgit v1.2.3-54-g00ecf From d031686fedd1f88fb628a8a87916477208377146 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 10 Oct 2014 15:00:29 +0300 Subject: ecj: fix unpackpost task ecj recipe is built as initial and as native, as such, unpackpost is run multiple times over the same code source. Added check if a move operation hasn't been already executed. Signed-off-by: Cristian Iorga --- recipes-core/ecj/libecj-bootstrap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc index 9e1cc1d..cd9d90f 100644 --- a/recipes-core/ecj/libecj-bootstrap.inc +++ b/recipes-core/ecj/libecj-bootstrap.inc @@ -29,7 +29,7 @@ do_unpackpost() { rm -rf META-INF # Move source into separate subdir. - if [ -d org ]; then + if [ -d org -a ! -d source/org ]; then mv org source/ fi # Remove stuff unneeded for the bootstrap compiler. -- cgit v1.2.3-54-g00ecf From 15a93920b17d3820974496ecb2328fabe527cceb Mon Sep 17 00:00:00 2001 From: Sven Ebenfeld Date: Wed, 29 Oct 2014 16:42:36 +0100 Subject: openjdk-7: inherit pkgconfig Building OpenJDK-7 in Yocto 1.7 (Dizzy) quits with errors as follows. Inheriting pkgconfig fixes this problem. .../configure: line 8645: syntax error near unexpected token `NSS,' .../configure: line 8645: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, NSS_FOUND=no)' --- recipes-core/openjdk/openjdk-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index 9c746de..4ce45d3 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc @@ -17,7 +17,7 @@ DEPENDS_append_libc-uclibc = " virtual/libiconv " # because structure sizes and/or alignment may differ. DEPENDS_append = " qemu-native " -inherit java autotools gettext qemu +inherit java pkgconfig autotools gettext qemu # OpenJDK uses slightly different names for certain arches. We need to know # this to create some files which are expected by the build. -- cgit v1.2.3-54-g00ecf