From 8e26ce73cccdd7cd839426ced3f91b54102ad5b1 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Thu, 31 Aug 2017 17:48:35 +0300 Subject: meta-java: remove dependency on meta-oe remove dependency on meta-oe Signed-off-by: Maxin B. John --- recipes-core/icedtea/icedtea7-native.inc | 3 +- recipes-core/openjdk/openjdk-7-common.inc | 6 ++-- recipes-core/openjdk/openjdk-8-cross.inc | 3 +- recipes-core/openjdk/openjdk-8-native.inc | 3 +- ...ac-add-check-for-NO_GETCONTEXT-definition.patch | 29 +++++++++++++++ recipes-extended/bdwgc/bdwgc/musl_header_fix.patch | 27 ++++++++++++++ recipes-extended/bdwgc/bdwgc_7.6.0.bb | 42 ++++++++++++++++++++++ 7 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 recipes-extended/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch create mode 100644 recipes-extended/bdwgc/bdwgc/musl_header_fix.patch create mode 100644 recipes-extended/bdwgc/bdwgc_7.6.0.bb diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 55cb7e7..1a7b9b6 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -5,7 +5,7 @@ INC_PR = "r1" DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ rhino-native ant-native libxslt-native attr-native \ - giflib-native jpeg-native libpng-native \ + jpeg-native libpng-native \ glib-2.0-native freetype-native zlib-native \ fontconfig-native zip-native \ unzip-native make-native util-linux-native\ @@ -13,6 +13,7 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ PACKAGECONFIG ??= "" PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-native libxext-native libxrender-native" +PACKAGECONFIG[gif] = ",--disable-system-gif, giflib" OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 1ac3154..3d0cdc4 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc @@ -26,10 +26,10 @@ PROVIDES += "${JDKPN}" DEPENDS = " \ icedtea7-native zip-native ant-native \ zlib libxslt-native \ - jpeg libpng giflib \ + jpeg libpng \ gtk+ glib-2.0 \ cups fontconfig \ - rhino krb5 \ + rhino \ libxt libxinerama libxrender libxtst libxi \ freetype alsa-lib libffi \ attr \ @@ -66,6 +66,8 @@ EXTRA_OECONF = " \ --disable-hotspot-tests \ --disable-langtools-tests \ --disable-jdk-tests \ + --disable-system-kerberos \ + --disable-system-gif \ --disable-docs \ --disable-nss \ --disable-system-lcms \ diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index ad3a44d..55af747 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc @@ -18,7 +18,7 @@ PATCHES_URI_append = "\ DEPENDS = "\ openjdk-8-native zip-native ant-native libxslt \ - jpeg libpng krb5 libffi fontconfig freetype \ + jpeg libpng libffi fontconfig freetype \ " PRIVATE_LIBS = "\ @@ -43,6 +43,7 @@ PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," PACKAGECONFIG[zip] = "--with-zlib=system,--with-zlib=bundled,zlib," PACKAGECONFIG[gif] = "--with-giflib=system,--with-giflib=bundled,giflib," +PACKAGECONFIG[krb5] = ",,," export WANT_LLVM_RELEASE = "3.5.2" PACKAGECONFIG[zero] = "--with-jvm-variants=zero,,," diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index fd97eff..d5079de 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc @@ -2,7 +2,7 @@ JDK_DIR = "openjdk-8-native" DEPENDS = "\ icedtea7-native ant-native \ libxslt-native attr-native \ - giflib-native jpeg-native libpng-native \ + jpeg-native libpng-native \ glib-2.0-native freetype-native fontconfig-native \ zlib-native zip-native \ unzip-native make-native \ @@ -13,6 +13,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[x11] = "--with-x,,libx11-native xproto-native libxt-native libxext-native libxrender-native" PACKAGECONFIG[cups] = "--with-cups,,cups" PACKAGECONFIG[alsa] = "--with-alsa,,alsa-lib-native" +PACKAGECONFIG[alsa] = "--with-giflib,,giflib-native" PACKAGECONFIG[jce] = "--enable-unlimited-crypto,," EXTRA_OECONF_append = "\ diff --git a/recipes-extended/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/recipes-extended/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch new file mode 100644 index 0000000..8ef774f --- /dev/null +++ b/recipes-extended/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch @@ -0,0 +1,29 @@ +configure.ac: add check for NO_GETCONTEXT definition + +Signed-off-by: Samuel Martin +[yann.morin.1998@free.fr: add a comment, change variable name, use + AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by + Thomas)] +Signed-off-by: "Yann E. MORIN" +Cc: Thomas Petazzoni + +--- +Upstream-Status: Pending + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- bdwgc-7.2f.orig/configure.ac 2014-06-01 19:00:47.000000000 +0200 ++++ bdwgc-7.2f/configure.ac 2014-12-23 14:13:11.585716713 +0100 +@@ -365,6 +365,12 @@ + AC_MSG_RESULT($ac_cv_fno_strict_aliasing) + fi + ++# Check for getcontext (uClibc can be configured without it, for example) ++AC_CHECK_FUNCS([getcontext]) ++AS_IF([test "$ac_cv_func_getcontext" = "no"], ++ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" ++ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) ++ + case "$host" in + # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 + # and unnecessary everywhere. diff --git a/recipes-extended/bdwgc/bdwgc/musl_header_fix.patch b/recipes-extended/bdwgc/bdwgc/musl_header_fix.patch new file mode 100644 index 0000000..4a18496 --- /dev/null +++ b/recipes-extended/bdwgc/bdwgc/musl_header_fix.patch @@ -0,0 +1,27 @@ +Add missing header to avoid: + +| 1472659610.016355: ../git/pthread_stop_world.c: In function 'GC_brief_async_signal_safe_sleep': +| 1472659610.0540252: ../git/pthread_stop_world.c:397:22: error: storage size of 'tv' isn't known +| 1472659610.0540252: struct timeval tv; +| 1472659610.0540252: ^~ +| 1472659610.054099: ../git/pthread_stop_world.c:397:22: warning: unused variable 'tv' [-Wunused-variable] +| 1472659610.054099: struct timeval tv; +| 1472659610.054099: ^~ +| 1472659610.054099: Makefile:1530: recipe for target 'pthread_stop_world.lo' failed + +in musl builds. + +Upstream-Status: Pending + +Index: git/pthread_stop_world.c +=================================================================== +--- git.orig/pthread_stop_world.c ++++ git/pthread_stop_world.c +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include "atomic_ops.h" + + /* It's safe to call original pthread_sigmask() here. */ diff --git a/recipes-extended/bdwgc/bdwgc_7.6.0.bb b/recipes-extended/bdwgc/bdwgc_7.6.0.bb new file mode 100644 index 0000000..dcb68f0 --- /dev/null +++ b/recipes-extended/bdwgc/bdwgc_7.6.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "A garbage collector for C and C++" + +DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ + used as a garbage collecting replacement for C malloc or C++ new. It allows\ + you to allocate memory basically as you normally would, without explicitly\ + deallocating memory that is no longer useful. The collector automatically\ + recycles memory when it determines that it can no longer be otherwise\ + accessed.\ + The collector is also used by a number of programming language\ + implementations that either use C as intermediate code, want to facilitate\ + easier interoperation with C libraries, or just prefer the simple collector\ + interface.\ + Alternatively, the garbage collector may be used as a leak detector for C\ + or C++ programs, though that is not its primary goal.\ + Empirically, this collector works with most unmodified C programs, simply\ + by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\ + calls, and removing free calls." + +HOMEPAGE = "http://www.hboehm.info/gc/" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.QUICK;md5=4f81f24ec69726c312487c2ac740e9e3" + +SRCREV = "8ac1d84a40eb7a431fec1b8097e3f24b48fb23fa" +SRC_URI = "git://github.com/ivmai/bdwgc.git \ + file://0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch \ + file://musl_header_fix.patch \ + " + +FILES_${PN}-doc = "${datadir}" + +S = "${WORKDIR}/git" + +ARM_INSTRUCTION_SET = "arm" + +inherit autotools pkgconfig + +# by default use external libatomic-ops +PACKAGECONFIG ??= "libatomic-ops" +PACKAGECONFIG[libatomic-ops] = "--with-libatomic-ops=yes,--with-libatomic-ops=no,libatomic-ops" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf