Skip to contentSkip to conversation

ti-gfx: use only -I${includedir} as pkg-config Cflags

PATCH New Peter Kümmel 2 participants 5 messages Jun 1, 2014 – Jun 8, 2014 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore

Peter Kümmel

author
#0 lore raw

PATCH 1/2 ti-gfx: use only -I${includedir} as pkg-config Cflags

Using only -I${includedir} in common practice.

Settings only -I${includedir}/GLES2 breaks Qt5's CMake files, because at configure time CMake only searchs the paths reported by pkg-config, and not even /usr/include is used as default.

Even though pkg-config strips out standard include path, that's not the case with pkgconf (which we are using) in cross-compilation, which correctly reports the /usr/include dir prefixed with the sysroot.

Reviewed-by "Yann E. MORIN" <[email protected]>
Signed-off-by Peter K?mmel <[email protected]>
---
 package/ti-gfx/egl.pc    |    2 +-
 package/ti-gfx/glesv2.pc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/ti-gfx/egl.pc +1 -1
index 223fb04..36ea413 100644
@@ -8,4 +8,4 @@ Description: TI Graphics SDK implementation of EGL
 Version: 1.9.2188537
 Requires:
 Libs: -L${libdir} -lEGL -lGLESv2 -lIMGegl
-Cflags: -I${includedir}/EGL/ -I${includedir}
+Cflags: -I${includedir}
package/ti-gfx/glesv2.pc +1 -1
index 4c70aec..b458133 100644
@@ -8,4 +8,4 @@ Description: TI Graphics SDK implementation of OpenGL ESv2
 Version: 1.9.2188537
 Requires:
 Libs: -L${libdir} -lGLESv2 -lGLES_CM -lsrv_um -lusc -lEGL -lIMGegl
-Cflags: -I${includedir}/GLES2
+Cflags: -I${includedir}
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 1/2 ti-gfx: use only -I${includedir} as pkg-config Cflags

Any reason why this is not committed?

Quoted 39 lines · Peter K?mmel

Using only -I${includedir} in common practice.

Settings only -I${includedir}/GLES2 breaks Qt5's CMake files, because at configure time CMake only searchs the paths reported by pkg-config, and not even /usr/include is used as default.

Even though pkg-config strips out standard include path, that's not the case with pkgconf (which we are using) in cross-compilation, which correctly reports the /usr/include dir prefixed with the sysroot.

Reviewed-by "Yann E. MORIN" <[email protected]>
Signed-off-by Peter K?mmel <[email protected]>
---
  package/ti-gfx/egl.pc    |    2 +-
  package/ti-gfx/glesv2.pc |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
package/ti-gfx/egl.pc +1 -1
index 223fb04..36ea413 100644
@@ -8,4 +8,4 @@ Description: TI Graphics SDK implementation of EGL
  Version: 1.9.2188537
  Requires:
  Libs: -L${libdir} -lEGL -lGLESv2 -lIMGegl
-Cflags: -I${includedir}/EGL/ -I${includedir}
+Cflags: -I${includedir}
package/ti-gfx/glesv2.pc +1 -1
index 4c70aec..b458133 100644
@@ -8,4 +8,4 @@ Description: TI Graphics SDK implementation of OpenGL ESv2
  Version: 1.9.2188537
  Requires:
  Libs: -L${libdir} -lGLESv2 -lGLES_CM -lsrv_um -lusc -lEGL -lIMGegl
-Cflags: -I${includedir}/GLES2
+Cflags: -I${includedir}
author
#2 lore raw

PATCH 2/2 sunxi-mali: use only -I${includedir} as pkg-config Cflags

In reply to Peter Kümmel

Using only -I${includedir} in common practice.

Settings only -I${includedir}/GLES2 breaks Qt5's CMake files, because at configure time CMake only searchs the paths reported by pkg-config, and not even /usr/include is used as default.

Even though pkg-config strips out standard include path, that's not the case with pkgconf (which we are using) in cross-compilation, which correctly reports the /usr/include dir prefixed with the sysroot.

Reviewed-by "Yann E. MORIN" <[email protected]>
Signed-off-by Peter K?mmel <[email protected]>
---
 package/sunxi-mali/egl.pc    |    2 +-
 package/sunxi-mali/glesv2.pc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/sunxi-mali/egl.pc +1 -1
index b062ad1..2823209 100644
@@ -8,5 +8,5 @@ Description: ARM Mali implementation of EGL
 Version: 1.4
 Requires:
 Libs: -L${libdir} -lEGL -lGLESv2 -lUMP
-Cflags: -I${includedir}/EGL/ -I${includedir}
+Cflags: -I${includedir}
package/sunxi-mali/glesv2.pc +1 -1
index 9273678..4702d13 100644
@@ -8,5 +8,5 @@ Description: ARM Mali implementation of OpenGL ESv2
 Version: 2.0
 Requires:
 Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP
-Cflags: -I${includedir}/GLES2
+Cflags: -I${includedir}
Signature · 1 line
1.7.10.4
author
#3 lore raw

PATCH 2/2 sunxi-mali: use only -I${includedir} as pkg-config Cflags

Any reason why this is not committed?

Quoted 41 lines · Peter K?mmel

Using only -I${includedir} in common practice.

Settings only -I${includedir}/GLES2 breaks Qt5's CMake files, because at configure time CMake only searchs the paths reported by pkg-config, and not even /usr/include is used as default.

Even though pkg-config strips out standard include path, that's not the case with pkgconf (which we are using) in cross-compilation, which correctly reports the /usr/include dir prefixed with the sysroot.

Reviewed-by "Yann E. MORIN" <[email protected]>
Signed-off-by Peter K?mmel <[email protected]>
---
  package/sunxi-mali/egl.pc    |    2 +-
  package/sunxi-mali/glesv2.pc |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
package/sunxi-mali/egl.pc +1 -1
index b062ad1..2823209 100644
@@ -8,5 +8,5 @@ Description: ARM Mali implementation of EGL
  Version: 1.4
  Requires:
  Libs: -L${libdir} -lEGL -lGLESv2 -lUMP
-Cflags: -I${includedir}/EGL/ -I${includedir}
+Cflags: -I${includedir}
package/sunxi-mali/glesv2.pc +1 -1
index 9273678..4702d13 100644
@@ -8,5 +8,5 @@ Description: ARM Mali implementation of OpenGL ESv2
  Version: 2.0
  Requires:
  Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP
-Cflags: -I${includedir}/GLES2
+Cflags: -I${includedir}
#4 lore raw

PATCH 1/2 ti-gfx: use only -I${includedir} as pkg-config Cflags

In reply to Peter Kümmel

Dear Peter K?mmel,

Quoted 6 lines · Peter K?mmel

Using only -I${includedir} in common practice.

Settings only -I${includedir}/GLES2 breaks Qt5's CMake files, because at configure time CMake only searchs the paths reported by pkg-config, and not even /usr/include is used as default.

Quoted 7 lines

Even though pkg-config strips out standard include path, that's not the case with pkgconf (which we are using) in cross-compilation, which correctly reports the /usr/include dir prefixed with the sysroot.

Reviewed-by "Yann E. MORIN" <[email protected]>
Signed-off-by Peter K?mmel <[email protected]>

Both patches applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com