aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
AgeCommit message (Collapse)Author
2018-02-26openjdk-8: strip leading non digit chars from GCCVERSIONrockoMax Krummenacher
When using the linaro cross toolchain GCCVERSION is set to "linaro-6.2%", i.e. the first char is not GCC's major version. Thus needed compiler options for GCC 6 are not set. Fix at least this case by stripping GCCVERSION up to the first numeric char. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 1fbdc60eaccaa29c2942d479f8068b722e7b5bf3) Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-12-22openjdk-8-native, icedtea7-native: use JAVA_TOOL_OPTIONS from environmentHaiqing Bai
Solution on how to be able to build openjdk for a build host that need the environment variable JAVA_TOOL_OPTIONS. Use JAVA_TOOL_OPTIONS from environment. On some machines this is needed in order to start java when the amount of RAM is limited for the user. Author: Peter Bergin <peter.bergin@windriver.com> Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-10-09Revert "openjdk-8-common: Fix the issue of building failed adlc on host with ↵Maxin B. John
gcc < 6" This reverts commit 6801f6d4e19c88dabd5a02dfbbf69a2dcc8e079c.
2017-10-02openjdk-8-common: Fix the issue of building failed adlc on host with gcc < 6Fupan Li
The patch recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-adlc-flags.patch had tried to fix this issue, and it tried to filter out the TARGET_FLAGS/TARGET_ CXXFLGAS, but for the flags such as "-fno-lifetime-dse" was added to CFLAGS/CXXFLAGS, directly, thus that patch failed to filter it out. To fix this issue, it's better to add those GCC version specific flags to BUILD_CFLAGS/ BUILD_CXXFLAGS and TARGET_CFLAGS/TARGET_CXXFLAGS separatedly, thus that patch can work as expected. Signed-off-by: Fupan Li <fupan.li@windriver.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-09-26openjdk-8-common: Fix warning evaluating CFLAGSRicardo Ribalda Delgado
Code is (on my opinion) simpler, making use of the dumpversion flag, instead of calling the pre-processor via a pipe. Flag has been tested on both clang gcc: ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.8 -dumpversion 4.8 ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-4.9 -dumpversion 4.9.3 ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-5 -dumpversion 5.4.1 ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-6 -dumpversion 6.4.0 ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ gcc-7 -dumpversion 7 ricardo@neopili:~/curro/qt5022/build-qt5022-pyro/repo/java$ clang-4.0 -dumpversion 4.2.1 Without this patch: WARNING: /home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb: Unable to export ${CXXFLAGS}: Failure expanding variable CXXFLAGS, expression was -isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include -O2 -pipe -D_GLIBCXX_USE_CXX11_ABI=0 ${@version_specific_cflags(d)} ${@jdk_cpp_options(d)} which triggered exception IndexError: string index out of range WARNING: /home/ricardo/curro/qt5022/build-qt5022-pyro/repo/yocto/../java/recipes-core/openjdk/openjdk-8-native_102b14.bb: Unable to export ${CFLAGS}: Failure expanding variable CFLAGS, expression was -isystem/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/recipe-sysroot-native/usr/include -O2 -pipe -Wno-error=deprecated-declarations ${@version_specific_cflags(d)} ${@jdk_cpp_options(d)} which triggered exception IndexError: string index out of range Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-09-26openjdk-8-native: Fix sigsegv with gcc7Ricardo Ribalda Delgado
OpenJDK does not build properly with GCC7. Add the same workaround that we have for GCC6. Without this patch: | # | # A fatal error has been detected by the Java Runtime Environment: | # | # SIGSEGV (0xb) at pc=0x00007fcad0efcd5b, pid=17206, tid=0x00007fcab264c700 | # | # JRE version: OpenJDK Runtime Environment (8.0_102-b14) (build 1.8.0_102-internal-b14) | # Java VM: OpenJDK 64-Bit Server VM (25.102-b14 mixed mode linux-amd64 compressed oops) | # Problematic frame: | # V [libjvm.so+0x78bd5b] Node::Node(unsigned int)+0x2b | # | # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again | # | # An error report file with more information is saved as: | # /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/openjdk-8-native/102b14-r0/build/hs_err_pid17206.log | [thread 140508549912320 also had an error] | | [error occurred during error reporting , id 0xb] | | # | # If you would like to submit a bug report, please visit: | # http://bugreport.java.com/bugreport/crash.jsp | # Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-05-29openjdk-8-native.inc: add coreutils-native to DEPENDSTim Orling
Without this it fails in do_configure because "comm" is not found. Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-05-29openjdk-7: fix compile errors with current poky master (gcc6)Richard Leitner
Using the current poky master openjdk-7 wasn't buildable. This patch fixes those problems by adding three more patches to openjdk-7. These patches basically add/fix GCC6 support. Furthermore the LDFLAGS_HASH_STYLE variable (which was removed by the icedtea-crosscompile-fix.patch) is re-introduced and set to "both" for compatibility reasons. Following two patches were originally written by Abdur Rehman and taken from meta-mentor [1]: icedtea-flags-to-compile-with-GCC-6.patch icedtea-specify-overloaded-variant-of-fmod.patch [1] https://github.com/MentorEmbedded/meta-mentor Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-05-29openjdk-8-cross.inc: fix a libpng build issueMing Liu
JDK/JRE fails to build for ARM NEON machines, due to a undefined symbol in libpng, as follows: | build/jdk/objs/libsplashscreen/pngrutil.o: In function `png_init_filter_functions': | jdk/src/share/native/sun/awt/libpng/pngrutil.c:4002: undefined reference to `png_init_filter_functions_neon' This is a known issue already fixed in openjdk upstream, back-port the fix. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-05-29openjdk-8/openjre-8: merge some redundant codeMing Liu
A identical PATCHES_URI_append is being set both in openjdk-8 and openjre-8, merge them into openjdk-8-cross.inc. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-05-29openjdk-8-cross.inc: tweak PACKAGECONFIG default valueMing Liu
When x11, alsa is being set in DISTRO_FEATURES, the users might expect openjdk build with the related options as well. For instance, they might be confused when the openjdk is still built as headless but x11 is actually enabled from system aspect. With this patch, the end users still can choose build openjdk without these options by overriding PACKAGECONFIG. Two small fixes are also needed to let openjdk build with x11: - Add libxtst to DEPENDS. - Pass ac_x_includes and ac_x_libraries to configure command. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-05-29openjdk-8-cross.inc: fix wrong sysroot pathMing Liu
The '--with-sys-root' should be set to ${STAGING_DIR_HOST} but not ${STAGING_DIR}. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2017-05-29openjdk-8-cross.inc: change a dependency alsa-lib-native to alsa-libMing Liu
For cross compiling, it should DEPENDS on alsa-lib instead of alsa-lib-native. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-12-06move from bb.data.getVar(x, d, 1) to d.getVar(x, True)Cody P Schafer
bb.data.getVar was removed, need to use the modern mechanism. Signed-off-by: Cody P Schafer <dev@codyps.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-12-06openjdk-7: ignore the readdir_r deprecation already ignored in openjdk-8Cody P Schafer
Without this, icedtea7-native (used to bootstrap openjdk) fails to build on my host system due to deprecation warnings being treated as errors. I haven't observed the same issue with openjdk-7 itself, but it seems likely to affect it as well, so I've added the -Wno-error flag there too. Signed-off-by: Cody P Schafer <dev@codyps.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-08-30Reimplement helper method for parallelizing JDK buildsKyle Russell
Simplifies duplicated implementation across multiple recipes that all inherited from java.bbclass. Previously implementation was not flexible in supporting other make job-limiting flags (like -l for load) that are typically passed in through PARALLEL_MAKE. (OpenJDK doesn't know about these other flags that might have gotten tagged on after the value for -j.) Signed-off-by: Kyle Russell <bkylerussell@gmail.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-08-30openjdk-7: update to IcedTea 2.6.5 OpenJDK 7u99b00Richard Leitner
OpenJDK 7 is updated from from 91b01 (IcedTea 2.6.2) to 99b00 (IcedTea 2.6.5). This update introduces following security updates: * Mar 2016 (IcedTea 2.6.5, OpenJDK 7 u99) [1] * Jan 2016 (IcedTea 2.6.4, OpenJDK 7 u95) [2] * Oct 2015 (IcedTea 2.6.3, OpenJDK 7 u91) [3] Due to the fact some "byte behavior improvements" were not ported to the ARM32-JIT in IcedTea 2.6.6 yet [6], [7] we need to stick IcedTea 2.6.5 for now. [1]http://blog.fuseyism.com/index.php/2016/03/25/security-icedtea-2-6-5-for-openjdk-7-released/ [2]http://blog.fuseyism.com/index.php/2016/01/21/security-icedtea-2-6-4-for-openjdk-7-released/ [3]http://blog.fuseyism.com/index.php/2015/11/17/security-icedtea-2-6-3-for-openjdk-7-released/ [6]http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2942 [7]http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot/rev/1c5c4564204e Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-08-24openjdk-8: Fix QA error caused by a missing hashErkka Kääriä
EXTRA_LDFLAGS were not used when building certain shared objects. This means that the Yocto specific linker flags were lost, which caused build failures due to a bad hash style QA error. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-08-24openjdk-8-release-102b14.inc: Ignore deprecationErkka Kääriä
readdir_r has been deprecated since glibc 2.24. As openjdk uses this function, a warning is generated during build that gets turned into an error when -Werror is used. While the readdir function is suggested as an replacement, it has slightly different API. The warning is ignored instead to prevent any unexpected breakage from patching the offending functions. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-08-24openjdk-8: Upgrade from u72 to u102Erkka Kääriä
Openjdk is upgraded from u72 to u102. Two patches are dropped, as these were backports and the fixes are present in the current version. One patch was refreshed. One patch was backported from the upcoming u112 to fix a zero mode crash. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-08-24openjdk-7: disable IcedTea's auto-downloadingRichard Leitner
Pass "--enable-downloading=no" to IcedTea's make. This ensures IcedTea uses the versions and checksums we defined in the openjdk-7-jre recipe for its "sub-modules". Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-08-09openjdk-8: ignore wrong GCCVERSION-flagSven Ebenfeld
During my recipe parsing, GCCVERSION in the cross case seems to be 'l' this leads to a ValueError during recipe parsing. Therefore check type before trying to parse the version flag. Signed-off-by: Sven Ebenfeld <sven.ebenfeld@vaillant-group.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-07-22openjdk-8: fix compiler detectionPatrick Ohly
When GCC is at version 4 or 5, parsing the recipe fails with: ERROR: ExpansionError during parsing .../ostro-os/meta-java/recipes-core/openjdk/openjdk-8_72b05.bb ... bb.data_smart.ExpansionError: Failure expanding variable CFLAGS, expression was -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=.../ostro-os/build/tmp-glibc/work/corei7-64-ostro- linux/openjdk-8/72b05-r0=/usr/src/debug/openjdk-8/72b05-r0 -fdebug-prefix-map=.../ostro-os/build/tmp-glibc/sysroots/x86_64-linux= -fdebug-prefix-map=.../ostro-os/build/tmp-glibc/sysroots/intel-corei7-64= -fstack-protector-strong -D_FORTIFY_SOURCE=2 ${ <at> version_specific_cflags(d)} -Wno-error=deprecated-declarations which triggered exception TypeError: can only join an iterable That's because FLAGS_GCC<version> may be unset, thus leading to d.getVar() returning None and ''.join(extraflags) failing. The join() is also redundant: extraflags already is a string. It happened to work because Python treats a string as sequence of single-character strings, and thus ''.join() re-created the original string. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-07-18openjdk-8: Detect compiler versionDaniel McGregor
Some supported hosts still use GCC 4.X. These don't support the flags needed to make GCC 6 work, so check the GCC version and add appropriate compiler flags. This implementation will append flags for any gcc version, but it's only used for GCC 6 right now. Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-07-18openjdk-7, openjdk-8: use vardeps to fix shared stateDaniel McGregor
Previously if PARALLEL_MAKE changed, so did the task signature for do_configure. Use vardepsvalue so that the signature remains constant. Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-06-30openjdk-8: make GCC6 happyDaniel McGregor
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>
2016-06-30openjdk-8: Add update version and build number to the java binariesBernhard Dick
The OpenJDK builds did not include the update version and build number leading to problems when applications check for the minimum needed version. This commit fixes it by adding the update version and build number to the configure parameters. Signed-off-by: Bernhard Dick <bernhard@bdick.de> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-06-20replace base_contains by bb.utils.containsMaxin B. John
Replace all instances of base_contains with bb.utils.contains to avoid warnings. Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-04-29openjre-8_72b05.bb: Add missing patchesErkka Kääriä
Two patches were only applied to openjdk-8. Apply these to jre as well Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-04-29Openjdk-8: Add -Wno-cpp to CFLAGS in certain makefilesErkka Kääriä
The security flag '-D_FORTIFY_SOURCE' requires at least -O to work, otherwise a warning is given. If CFLAGS additionally contains -Werror, this warning turns into an error. As Openjdk build system intentionally deoptimizes certains files due to potential bad codegen during optimization, build will fail when both '-D_FORTIFY_SOURCE' and '-Werror' are used. As turning the optimizations back on will likely break things, the warning is silenced instead. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-04-26openjdk-8: use private libsDaniel McGregor
Prevent a non-deterministic run time dependency between openjdk-8 and openjre-8. Without PRIVATE_LIBS, if openjre is built before openjdk, openjdk might RDEPEND on openjre. Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-04-26openjdk-8: make jar repacking optionalDaniel McGregor
Repacking the runtime jar files takes a long time, and is only done to save some space. Make it optional to speed up builds that don't need it. Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-03-23Openjdk-8: Fix build flags for adlcErkka Kääriä
Adlc is a native tool that openjdk builds and uses during its build process. Bitbake however passes target machine specific CFLAGS and CXXFLAGS because we are crosscompiling openjdk for the target architecture. This can cause issues, if these flags contains values, that work for the Yocto provided crosscompiler but not for the system compiler. As an example, compilation will fail on Ubuntu 14.04 if -fstack-protector-strong is specified in the distro security flags. Ubuntu 14.04 ships with GCC 4.8, whereas this flag is only supported by GCC 4.9+. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-03-23Openjdk-8: Fix openjdk build when CXX contains assembler argumentsErkka Kääriä
Builds currently fail, if CXX also contains assembler arguments. These arguments are in form "-Wa,args,are,here". When this string is then used in openjdk make process, it is inserted before the make evaluates its argument lists. As these lists are comma separated, the commas in assembler argument list are interpreted as list separators, which breaks the build. This is fixed by adding the extra '$', which means the string is inserted after make evaluates the list. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-01-04openjdk-8: fix the alternative for javacJackie Huang
* ${PN}-jdk doesn't exist at all so the alternative for javac is invalid. * remove the useless commented lines as well. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-01-04openjdk-7: fix the incorrect URIs and checksumsJackie Huang
The error in do_configure is like: openjdk.tar.bz2: FAILED /usr/bin/sha256sum: WARNING: 1 of 1 computed checksum did NOT match That's because the URIs and checksums do not match the ones defined in Makefile.am, then the configure will fail the test and download again from ICEDTEA_DROP_URL. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-01-04openjdk hotspot build system std.h fixAmy Fong
Backport from upstream from jdk9 Hotspot build system looking for sdt.h in the wrong place Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04icedtea7-native/openjdk-7: fails on hosts with no unzipAmy Fong
Fails with an error message /usr/bin/unzip not found. Additionally, icedtea7 enables you to specify an unzip to use by setting the variable UNZIP, this results in an error because unzip uses UNZIP to specify options, hence you'll end up with unzip trying to unzip unzip. Note: Same issue applies to openjdk Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04openjdk-7: add depends on attrAmy Fong
openjdk depends on attr, this can result in a configure failure if the dependency is missing. checking for sys/epoll.h... (cached) yes checking attr/xattr.h usability... no checking attr/xattr.h presence... no checking for attr/xattr.h... no configure: error: Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary. Configure failed. The contents of all config.log files follows to aid debugging Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04openjdk: postinst cleanupAmy Fong
Some of the postinst rules results in a build error because "ERR" is in the first line. Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04openjdk: add keytool linkAmy Fong
Add alternative link keytool Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04openjdk-7: added java tools to the jdk packageAmy Fong
The jdk package was missing tools like javac and tools.jar. Adding jvm to the packaging pulls in the tool set. Signed-off-by: Paul Barrette <paul.barrette@windriver.com> Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04openjdk: autools not to override B varAmy Fong
${B} is set before autotools and thus is overrided by autotools. Some of the patches within icedtea are expected to be patched against ${S}/build (during do_configure() phase). As autotools to change B = "${WORKDIR}/build", so this causes some patches failed to apply and hence breaks do_configure() with the following errors: | patching file openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | can't find file to patch at input line 13 | Perhaps you used the wrong -p or --strip option? | The text leading up to this was: | -------------------------- | |--- | | build/openjdk/corba/make/common/shared/Defs-utils.gmk | 6 +++--- | | build/openjdk/jdk/make/common/Demo.gmk | 2 +- | | build/openjdk/jdk/make/common/Release.gmk | 2 +- | | build/openjdk/jdk/make/common/internal/ImportComponents.gmk | 4 ++-- | | build/openjdk/jdk/make/common/shared/Defs-utils.gmk | 6 +++--- | | build/openjdk/jdk/make/common/shared/Sanity.gmk | 2 +- | | build/openjdk/jdk/make/java/redist/Makefile | 4 ++-- | | 7 files changed, 13 insertions(+), 13 deletions(-) | | | |--- a/build/openjdk/corba/make/common/shared/Defs-utils.gmk | |+++ b/build/openjdk/corba/make/common/shared/Defs-utils.gmk | -------------------------- | File to patch: | Skip this patch? [y] | File to patch: | Skip this patch? [y] | Skipping patch. Signed-off-by: Vu Tran <vu.tran@windriver.com> Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04openjdk-8-native: fix improper do_install and PROVIDESJackie Huang
We had: virtual/jar-native provided by fastjar-native virtual/java-native provided by cacao-native and jamvm-native virtual/javac-native provided by ecj-bootstrap-native Then openjdk-8-native added and also provides: virtual/java-native and virtual/javac-native (it also installs ${STAGING_BINDIR_NATIVE}/jar but doesn't add virtual/jar-native in the PROVIDES) which introduces circular dependencies, java-bootstrap-components.bbclass is to avoid the circular dependencies but it's not a correct way since it make two conflicted packages build into the same sysroot: DEPENDS_prepend_class-native = " ecj-bootstrap-native " DEPENDS_prepend_class-target = " virtual/javac-native " virtual/javac-native is provided by openjdk-8-native, and it assumed that ecj-bootstrap-native, fastjar-native and cacao-native/jamvm-native are always built before openjdk-8-native, then in the do_install of penjdk-8-native, it removes them from staging dirs first, then install (create symlinks for) these files in staging dirs directly, which results with empty sstate and builds from sstate cache or builds not in this assumption will fail. The fixes here includes: - Revert "meta-java: rely on well known bootstrap-path" in previous commit to remove the improper java-bootstrap-components.bbclass - Do not let openjdk-8-native provides jar, java and javac, just like what we do in icedtea7-native, which can provides but not to avoid circular dependencies and conflicts. - make cacao-native back to provide virtual/java-native, and ecj-bootstrap-native back to provide virtual/javac-native - Add back provider settings in README. - Remove the update-alternatives in openjdk-8-native, it doesn't work for native package. Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2015-12-30openjdk-8/openjre-8: skip the dev-so testJackie Huang
Fixed: ERROR: QA Issue: non -dev/-dbg/nativesdk- package contains symlink .so: openjdk-8 path 'work/core2-64-poky-linux/openjdk-8/72b05-r0/packages-split/openjdk-8/usr/lib/jvm/openjdk-8/jre/lib/amd64/server/libjsig.so' [dev-so] The symlink .so is valid so we just skip the test just like what we does in openjdk-7. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2015-12-30openjdk-8/openjre-8: fix host-user-contaminated QA issueJackie Huang
Fixed: WARNING: QA Issue: openjdk-8: /openjdk-8-doc/usr/lib/jvm/openjdk-8/jre/THIRD_PARTY_README is owned by uid 1786, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] The use of cp results in files in the recipe being owned by the user running bitbake, so fix the owner to root:root Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2015-12-17openjdk-8: Use zero mode on armErkka Kääriä
Currently arm build fails due to hotspot errors. Use zero mode instead. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2015-12-17openjdk-7: skip the already-stripped testJackie Huang
libfreetype.so.6 is copied from STAGING_LIBDIR and binaries/libraries in sysroot are already stripped since the following commit in oe-core: "30f3774 staging: Strip files in sysroot" Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2015-12-17openjdk-7: drop an inappropriate patchJackie Huang
The patch icedtea-jdk-build-nio-gensor-genuc-gensc-static.patch is to add static option to build nio gensor/genuc/gensc, and was added when upgrading to IcedTea 2.6.1 OpenJDK 7u85b01. Another patch icedtea-jdk-nio-use-host-cc.patch uses host cc for nio build so it fails on host that lack of static libraries: | /usr/bin/ld: cannot find -lpthread And there is no comments explaining why it needs static linking, so drop the patch for now unless we have better understanding and make a more proper patch. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2015-12-17openjdk-8: fix rewrite QA warningsJens Rehsack
Fix bitbake warnings from variable renaming like Variable key FILES_${PN} (${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} ${localstatedir} ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev/rules.d ${prefix}/lib/udev/rules.d ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps ${datadir}/applications ${datadir}/idl ${datadir}/omf ${datadir}/sounds ${libdir}/bonobo/servers) replaces original key FILES_openjre-8 ( ${JRE_HOME}/bin/[a-z]* ${JRE_HOME}/lib/[a-z]* ${JRE_HOME}/LICENSE ${JRE_HOME}/release ). It is caused by using FILES_${PN} and FILES_{JDKPN} or FILES_${JREPN}, respectively. Moving FILES_{JDKPN} to openjdk-8_%.bb and FILES_${JREPN} to openjre-8_%.bb to allow consequently use FILES_${PN}. Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-01 21:20:49 +0000