diff options
Diffstat (limited to 'recipes-core/icedtea')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 20 | ||||
-rw-r--r-- | recipes-core/icedtea/openjdk-7-release-03b147.inc | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index f53715f..331b7a4 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -16,25 +16,25 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} | |||
16 | PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" | 16 | PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" |
17 | 17 | ||
18 | OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" | 18 | OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" |
19 | CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" | 19 | CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" |
20 | 20 | ||
21 | # Disable dead store elimination and set C++ standard to C++98. | 21 | # Disable dead store elimination and set C++ standard to C++98. |
22 | # There are dead stores in the JVM that would be pretty hard to | 22 | # There are dead stores in the JVM that would be pretty hard to |
23 | # remove, so disable the optimisation in the compiler. | 23 | # remove, so disable the optimisation in the compiler. |
24 | CFLAGS_append = " -fno-tree-dse" | 24 | CFLAGS:append = " -fno-tree-dse" |
25 | CXXFLAGS_append = " -fno-tree-dse" | 25 | CXXFLAGS:append = " -fno-tree-dse" |
26 | CXX_append = " -std=gnu++98" | 26 | CXX:append = " -std=gnu++98" |
27 | 27 | ||
28 | # WORKAROUND: ignore errors from new compilers | 28 | # WORKAROUND: ignore errors from new compilers |
29 | CFLAGS_append = " -Wno-error=stringop-overflow -Wno-error=return-type" | 29 | CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type" |
30 | 30 | ||
31 | # oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9" | 31 | # oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9" |
32 | HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}" | 32 | HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}" |
33 | # if compiler version 9 detected, add more CFLAGS | 33 | # if compiler version 9 detected, add more CFLAGS |
34 | CFLAGS_append = " ${@oe.utils.conditional('HOST_COMPILER_MAJOR', '9', '-Wno-error=format-overflow', '', d)}" | 34 | CFLAGS:append = " ${@oe.utils.conditional('HOST_COMPILER_MAJOR', '9', '-Wno-error=format-overflow', '', d)}" |
35 | 35 | ||
36 | # Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources | 36 | # Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources |
37 | CFLAGS_append = " -fcommon" | 37 | CFLAGS:append = " -fcommon" |
38 | 38 | ||
39 | inherit java autotools pkgconfig | 39 | inherit java autotools pkgconfig |
40 | inherit openjdk-build-helper | 40 | inherit openjdk-build-helper |
@@ -71,7 +71,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" | |||
71 | 71 | ||
72 | # libfreetype.so.6 is copied from STAGING_LIBDIR | 72 | # libfreetype.so.6 is copied from STAGING_LIBDIR |
73 | # which is already stripped. | 73 | # which is already stripped. |
74 | INSANE_SKIP_${PN} = "already-stripped" | 74 | INSANE_SKIP:${PN} = "already-stripped" |
75 | 75 | ||
76 | EXTRA_OECONF = "\ | 76 | EXTRA_OECONF = "\ |
77 | --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 77 | --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
@@ -101,7 +101,7 @@ JDK_DIR = "icedtea7-native" | |||
101 | 101 | ||
102 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" | 102 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" |
103 | 103 | ||
104 | do_configure_prepend() { | 104 | do_configure:prepend() { |
105 | arch="${@openjdk_build_helper_get_icedtea_arch(d)}" | 105 | arch="${@openjdk_build_helper_get_icedtea_arch(d)}" |
106 | libarch="${@openjdk_build_helper_get_icedtea_arch(d)}" | 106 | libarch="${@openjdk_build_helper_get_icedtea_arch(d)}" |
107 | 107 | ||
@@ -132,7 +132,7 @@ do_configure_prepend() { | |||
132 | 132 | ||
133 | POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" | 133 | POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" |
134 | 134 | ||
135 | do_configure_append() { | 135 | do_configure:append() { |
136 | oe_runmake patch-fsg | 136 | oe_runmake patch-fsg |
137 | 137 | ||
138 | for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ; | 138 | for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ; |
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index 627501c..16bf592 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | |||
5 | FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b147:" | 5 | FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b147:" |
6 | 6 | ||
7 | # Force arm mode for now | 7 | # Force arm mode for now |
8 | ARM_INSTRUCTION_SET_armv4t = "ARM" | 8 | ARM_INSTRUCTION_SET:armv4t = "ARM" |
9 | 9 | ||
10 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" | 10 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" |
11 | 11 | ||
@@ -133,4 +133,4 @@ export DISTRIBUTION_PATCHES = " \ | |||
133 | 133 | ||
134 | # readdir_r was deprecated in glibc-2.24. Ignore the error for now | 134 | # readdir_r was deprecated in glibc-2.24. Ignore the error for now |
135 | # NOTE: When updating the recipe, please check if this is still needed | 135 | # NOTE: When updating the recipe, please check if this is still needed |
136 | CFLAGS_append = " -Wno-error=deprecated-declarations" | 136 | CFLAGS:append = " -Wno-error=deprecated-declarations" |