diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-06-30 12:05:23 -0700 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-07-02 08:52:17 +0200 |
commit | 7483a6c981c85517bb39f03bf20bcce4e3ce3b5c (patch) | |
tree | 76143933f7fcb04511bcc15cb2b361a682acd982 /recipes-core/icedtea/icedtea7-native.inc | |
parent | 498492b8b4d8a32fd1bc9b124cad5a022b7affae (diff) | |
download | meta-java-7483a6c981c85517bb39f03bf20bcce4e3ce3b5c.tar.gz |
icedtea7-native: set ALT_CUPS_HEADERS_PATH to staging
ALT_CUPS_HEADERS_PATH eventually gets added to some links as
-I/usr/include
If you are using the buildtools-extended-tarball, the limits.h
from the system gets included first then later the limits.h
from the buildtools tarball gets added again, but is missing
glibc definitions, if the system glibc is much older(centos7).
This leads to:
In file included from /usr/include/limits.h:124,
from /usr/include/sys/param.h:26,
from ../../../src/solaris/javavm/export/jvm_md.h:35,
from ../../../src/share/javavm/export/jvm.h:32,
from ../../../src/solaris/native/sun/awt/awt.h:33,
from ../../../src/solaris/native/sun/awt/awt_p.h:75,
from ../../../src/solaris/native/sun/awt/awt_MToolkit.c:26:
/build/buildtools/sysroots/x86_64-montavistasdk-linux/usr/include/limits.h:145:17: error: missing binary operator before token "("
145 | #if __GLIBC_USE (IEC_60559_BFP_EXT_C2X)
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/icedtea/icedtea7-native.inc')
-rw-r--r-- | recipes-core/icedtea/icedtea7-native.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index c575059..5351fe1 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc | |||
@@ -66,6 +66,7 @@ B = "${S}/build" | |||
66 | # openjdk looks in /usr/include and /usr/lib for freetype by default. | 66 | # openjdk looks in /usr/include and /usr/lib for freetype by default. |
67 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | 67 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" |
68 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | 68 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" |
69 | export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" | ||
69 | 70 | ||
70 | # libfreetype.so.6 is copied from STAGING_LIBDIR | 71 | # libfreetype.so.6 is copied from STAGING_LIBDIR |
71 | # which is already stripped. | 72 | # which is already stripped. |