[PATCH] sdl2: fix sdl2.pc include paths

[PATCH] sdl2: fix sdl2.pc include paths

[Samuli Piippo]

SDL2 dumps all cflags to the sdl2.pc, which might then contain paths
to the recipe sysroot include dirs.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
 meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
index 812a9abf3c..a9c5d8a443 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
@@ -64,6 +64,10 @@ do_configure_prepend() {
         export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
 }
 
+do_install_append() {
+    sed -i -e "s|${STAGING_INCDIR}|$\{includedir}|g" ${D}${libdir}/pkgconfig/sdl2.pc
+}
+
 FILES_${PN}-dev += "${libdir}/cmake"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1

Re: [PATCH] sdl2: fix sdl2.pc include paths

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]

Would it be easier to just remove @SDL_CFLAGS@ from sdl.pc.in?  Does that
contain other values that are needed, or are they all spurious?

Ross

On Sat, 12 Jan 2019 at 08:43, Samuli Piippo <samuli.piippo@qt.io> wrote:

> SDL2 dumps all cflags to the sdl2.pc, which might then contain paths
> to the recipe sysroot include dirs.
>
> Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
> ---
>  meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
> b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
> index 812a9abf3c..a9c5d8a443 100644
> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
> @@ -64,6 +64,10 @@ do_configure_prepend() {
>          export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
>  }
>
> +do_install_append() {
> +    sed -i -e "s|${STAGING_INCDIR}|$\{includedir}|g"
> ${D}${libdir}/pkgconfig/sdl2.pc
> +}
> +
>  FILES_${PN}-dev += "${libdir}/cmake"
>
>  BBCLASSEXTEND = "native nativesdk"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 2372 bytes --]

Re: [PATCH] sdl2: fix sdl2.pc include paths

[Andreas Müller]

My two comments:

1. There is already an upgrade libsdl2 -> 2.09 pending so this patch
needs rebase [1]
2. Removing CFLAGS is easier but potentially a risk of unwanted
effects. My sdl2.pc contains -D_REENTRANT. This should be obsolete but
who guarantees that there isn't some old application still requiring
it (because it is set in other build environments).

[1] http://lists.openembedded.org/pipermail/openembedded-core/2019-January/277739.html

Andreas


On Mon, Jan 14, 2019 at 11:52 AM Burton, Ross <ross.burton@intel.com> wrote:
>
> Would it be easier to just remove @SDL_CFLAGS@ from sdl.pc.in?  Does that contain other values that are needed, or are they all spurious?
>
> Ross
>
> On Sat, 12 Jan 2019 at 08:43, Samuli Piippo <samuli.piippo@qt.io> wrote:
>>
>> SDL2 dumps all cflags to the sdl2.pc, which might then contain paths
>> to the recipe sysroot include dirs.
>>
>> Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
>> ---
>>  meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
>> index 812a9abf3c..a9c5d8a443 100644
>> --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
>> +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
>> @@ -64,6 +64,10 @@ do_configure_prepend() {
>>          export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
>>  }
>>
>> +do_install_append() {
>> +    sed -i -e "s|${STAGING_INCDIR}|$\{includedir}|g" ${D}${libdir}/pkgconfig/sdl2.pc
>> +}
>> +
>>  FILES_${PN}-dev += "${libdir}/cmake"
>>
>>  BBCLASSEXTEND = "native nativesdk"
>> --
>> 2.17.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

[PATCH v2] sdl2: fix sdl2.pc include paths

[Samuli Piippo]

SDL2 dumps all cflags to the sdl2.pc, which might then contain paths
to the recipe sysroot include dirs.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
 meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb
index a5ec77728a..8941f05958 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb
@@ -63,6 +63,10 @@ do_configure_prepend() {
         export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
 }
 
+do_install_append() {
+    sed -i -e "s|${STAGING_INCDIR}|$\{includedir}|g" ${D}${libdir}/pkgconfig/sdl2.pc
+}
+
 FILES_${PN}-dev += "${libdir}/cmake"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1