From 7483a6c981c85517bb39f03bf20bcce4e3ce3b5c Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Tue, 30 Jun 2020 12:05:23 -0700 Subject: 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 Signed-off-by: Richard Leitner --- recipes-core/icedtea/icedtea7-native.inc | 1 + 1 file changed, 1 insertion(+) 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" # openjdk looks in /usr/include and /usr/lib for freetype by default. export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" +export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" # libfreetype.so.6 is copied from STAGING_LIBDIR # which is already stripped. -- cgit v1.2.3-54-g00ecf