summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-cross.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc27
1 files changed, 17 insertions, 10 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index 18b99fd..6c0f949 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -13,6 +13,7 @@ PRIVATE_LIBS = "\
13 libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \ 13 libjdwp.so libjli.so libjpeg.so libjsdt.so libjsig.so libjvm.so liblcms.so \
14 libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \ 14 libmanagement.so libmlib_image.so libnet.so libnio.so libnpt.so libsaproc.so \
15 libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \ 15 libsctp.so libsplashscreen.so libsunec.so libunpack.so libverify.so libzip.so \
16 libfreetype.so.6 \
16" 17"
17 18
18PACKAGECONFIG ??= " \ 19PACKAGECONFIG ??= " \
@@ -42,23 +43,22 @@ PACKAGECONFIG[repack] = ",,,"
42 43
43PACKAGECONFIG[kerberos] = ",,krb5" 44PACKAGECONFIG[kerberos] = ",,krb5"
44 45
45CACHED_CONFIGUREVARS = " \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_includes=${STAGING_INCDIR}', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'ac_x_libraries=${STAGING_LIBDIR}', '', d)} \
48"
49
50require openjdk-8-common.inc 46require openjdk-8-common.inc
51 47
52JAVA_HOME[unexport] = "1" 48JAVA_HOME[unexport] = "1"
53 49
54SRC_URI_append = "\ 50SRC_URI_append = "\
55 file://jvm.cfg \ 51 file://jvm.cfg \
52 file://0011-autoconf-fix-CC-with-arguments-detection.patch \
53 file://0012-autoconf-NativeCompilation-remove-sysroot.patch \
56" 54"
57 55
56BUILD_CFLAGS_append = " -Wno-stringop-overflow -Wno-error"
57TARGET_CFLAGS_append = " -Wno-stringop-overflow -Wno-error"
58
58EXTRA_OECONF_append = "\ 59EXTRA_OECONF_append = "\
59 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 60 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
60 \ 61 \
61 --with-sys-root=${STAGING_DIR_HOST} \
62 --with-tools-dir=${STAGING_DIR_NATIVE} \ 62 --with-tools-dir=${STAGING_DIR_NATIVE} \
63 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ 63 --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \
64 --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \ 64 --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \
@@ -66,13 +66,21 @@ EXTRA_OECONF_append = "\
66 --disable-precompiled-headers \ 66 --disable-precompiled-headers \
67 --disable-zip-debug-info \ 67 --disable-zip-debug-info \
68 \ 68 \
69 --with-sys-root=${STAGING_DIR_HOST} \
69 --with-extra-cflags='${CFLAGS}' \ 70 --with-extra-cflags='${CFLAGS}' \
70 --with-extra-cxxflags='${CXXFLAGS}' \ 71 --with-extra-cxxflags='${CXXFLAGS}' \
71 --with-extra-ldflags='${LDFLAGS}' \ 72 --with-extra-ldflags='${LDFLAGS}' \
73 --with-freetype-include=${STAGING_INCDIR}/freetype2 \
74 --with-freetype-lib=${STAGING_LIBDIR} \
72 \ 75 \
73 ${@jdk_configure_options(d)} \ 76 ${@jdk_configure_options(d)} \
74" 77"
75 78
79do_configure_prepend() {
80 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
81 export ${@jdk_environment_options(d)}
82}
83
76do_configure_append() { 84do_configure_append() {
77 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk 85 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk
78} 86}
@@ -97,8 +105,6 @@ do_install_append() {
97export MAKE_VERBOSE = "y" 105export MAKE_VERBOSE = "y"
98export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" 106export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip"
99 107
100BUILD_LD="${BUILD_CCLD}"
101
102EXTRA_OEMAKE_append = '\ 108EXTRA_OEMAKE_append = '\
103 ${@jdk_make_options(d)} \ 109 ${@jdk_make_options(d)} \
104 ALT_SDT_H="${STAGING_INCDIR}" \ 110 ALT_SDT_H="${STAGING_INCDIR}" \
@@ -125,5 +131,6 @@ python remove_debuglink() {
125 131
126PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" 132PACKAGE_PREPROCESS_FUNCS += "remove_debuglink"
127 133
128# There is a symlink to a .so but this one is valid. 134# FIXME libjsig.so is a symlink to a .so but this one is valid
129INSANE_SKIP_${PN} = "dev-so" 135# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped
136INSANE_SKIP_${PN} = "dev-so already-stripped"