[meta-java,master|dunfell] icedtea7-native: set ALT_CUPS_HEADERS_PATH to staging

Submitted by Jeremy Puhlman on June 30, 2020, 7:05 p.m. | Patch ID: 174107

Details

Message ID 20200630190523.9795-1-jpuhlman@mvista.com
State Master Next
Delegated to: Richard Leitner
Headers show

Commit Message

Jeremy Puhlman June 30, 2020, 7:05 p.m.
From: Jeremy Puhlman <jpuhlman@mvista.com>

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>
---
 recipes-core/icedtea/icedtea7-native.inc | 1 +
 1 file changed, 1 insertion(+)

Patch hide | download patch | download mbox

diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index b0b9419..ba94927 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -61,6 +61,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.

Comments

Richard Leitner July 2, 2020, 6:54 a.m.
Hi,
thank you for your patch!

This is a note to let you know that I've just added this patch to the
master-next branch of the meta-java repository at
	git://git.yoctoproject.org/meta-java

As soon as it has gone through some more testing it will likely be
merged to the master branch.

If you have any questions, please let me know.

regards;rl

On Tue, Jun 30, 2020 at 12:05:23PM -0700, Jeremy Puhlman wrote:
> From: Jeremy Puhlman <jpuhlman@mvista.com>
> 
> 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>
> ---
>  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 b0b9419..ba94927 100644
> --- a/recipes-core/icedtea/icedtea7-native.inc
> +++ b/recipes-core/icedtea/icedtea7-native.inc
> @@ -61,6 +61,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.
> -- 
> 2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#85551): https://lists.openembedded.org/g/openembedded-devel/message/85551
Mute This Topic: https://lists.openembedded.org/mt/75220350/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-