diff options
author | Daniel McGregor <daniel.mcgregor@vecima.com> | 2016-06-22 10:38:45 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-06-30 12:07:44 -0300 |
commit | 33ddb28a6428b02ddcc82d1954ecf27cd426fbb5 (patch) | |
tree | eb39d51b3b35a2a3096bfd79ca95e2179dd0be8c /recipes-core/openjdk/openjdk-8-cross.inc | |
parent | 6483010d92be7f6e1e0a268d1ca4b5fc4353c70e (diff) | |
download | meta-java-33ddb28a6428b02ddcc82d1954ecf27cd426fbb5.tar.gz |
openjdk-8: make GCC6 happy
GCC 6 sets the default C++ standard to C++14 and introduces dead store
elimination by default. OpenJDK 8 is not ready for either of these
changes, so set the C++ standard back to gnu++98 and disable dead
store elimination.
Switched to using --with-extra-cflags, cxxflags, and ldflags. The added
patch fixes building when using those flags, and are needed to get
CFLAGS into the JDK build in the native case.
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 3189764..11e94ce 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -39,9 +39,6 @@ SRC_URI_append = "\ | |||
39 | file://jvm.cfg \ | 39 | file://jvm.cfg \ |
40 | " | 40 | " |
41 | 41 | ||
42 | # do not use --wth-extra-cflags, it breaks building demos for jdk | ||
43 | # maybe disabling demos is more reasonable than avoiding --wth-extra-cflags | ||
44 | # needs discussion | ||
45 | EXTRA_OECONF_append = "\ | 42 | EXTRA_OECONF_append = "\ |
46 | --with-jobs=${@get_jdk8_native_jobs(d)} \ | 43 | --with-jobs=${@get_jdk8_native_jobs(d)} \ |
47 | \ | 44 | \ |
@@ -53,6 +50,10 @@ EXTRA_OECONF_append = "\ | |||
53 | --disable-precompiled-headers \ | 50 | --disable-precompiled-headers \ |
54 | --disable-zip-debug-info \ | 51 | --disable-zip-debug-info \ |
55 | \ | 52 | \ |
53 | --with-extra-cflags='${CFLAGS}' \ | ||
54 | --with-extra-cxxflags='${CXXFLAGS}' \ | ||
55 | --with-extra-ldflags='${LDFLAGS}' \ | ||
56 | \ | ||
56 | ${@jdk_configure_options(d)} \ | 57 | ${@jdk_configure_options(d)} \ |
57 | " | 58 | " |
58 | 59 | ||
@@ -83,10 +84,6 @@ export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LE | |||
83 | BUILD_LD="${BUILD_CCLD}" | 84 | BUILD_LD="${BUILD_CCLD}" |
84 | 85 | ||
85 | EXTRA_OEMAKE_append = '\ | 86 | EXTRA_OEMAKE_append = '\ |
86 | OE_CFLAGS="${CFLAGS}" \ | ||
87 | OE_CPPFLAGS="${CPPFLAGS}" \ | ||
88 | OE_CXXFLAGS="${CXXFLAGS}" \ | ||
89 | OE_LDFLAGS="${LDFLAGS}" \ | ||
90 | ${@jdk_make_options(d)} \ | 87 | ${@jdk_make_options(d)} \ |
91 | ALT_SDT_H="${STAGING_INCDIR}" \ | 88 | ALT_SDT_H="${STAGING_INCDIR}" \ |
92 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ | 89 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ |