[PATCH] glslang: strip whitespace in pkgconfig file

[PATCH] glslang: strip whitespace in pkgconfig file

[Ross Burton]

Whilst pkg-config is fine with .pc files containing leading whitespace,
pkgconf is less forgiving.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../0001-generate-glslang-pkg-config.patch    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
index ef092f17a1..cddd330971 100644
--- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
+++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
@@ -34,14 +34,14 @@ index 00000000..64b6882d
 --- /dev/null
 +++ b/glslang/glslang.pc.cmake.in
 @@ -0,0 +1,11 @@
-+    prefix=@CMAKE_INSTALL_PREFIX@
-+    exec_prefix=@CMAKE_INSTALL_PREFIX@
-+    libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+    includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+    
-+    Name: @PROJECT_NAME@
-+    Description: OpenGL and OpenGL ES shader front end and validator
-+    Requires:
-+    Version: @GLSLANG_VERSION@
-+    Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
-+    Cflags: -I${includedir}
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_PREFIX@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++
++Name: @PROJECT_NAME@
++Description: OpenGL and OpenGL ES shader front end and validator
++Requires:
++Version: @GLSLANG_VERSION@
++Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
++Cflags: -I${includedir}
-- 
2.25.1

Re: [OE-core] [PATCH] glslang: strip whitespace in pkgconfig file

[Khem Raj]

On 4/9/21 8:00 AM, Ross Burton wrote:
> Whilst pkg-config is fine with .pc files containing leading whitespace,
> pkgconf is less forgiving.
> 

thanks, I was thinking this could be painful, perhaps a QA check might 
ease out the issue a bit as well. I dont know how many .pc files will 
have this issue. What are usual signs when this fails in this way ?

> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>   .../0001-generate-glslang-pkg-config.patch    | 22 +++++++++----------
>   1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
> index ef092f17a1..cddd330971 100644
> --- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
> +++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
> @@ -34,14 +34,14 @@ index 00000000..64b6882d
>   --- /dev/null
>   +++ b/glslang/glslang.pc.cmake.in
>   @@ -0,0 +1,11 @@
> -+    prefix=@CMAKE_INSTALL_PREFIX@
> -+    exec_prefix=@CMAKE_INSTALL_PREFIX@
> -+    libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
> -+    includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
> -+
> -+    Name: @PROJECT_NAME@
> -+    Description: OpenGL and OpenGL ES shader front end and validator
> -+    Requires:
> -+    Version: @GLSLANG_VERSION@
> -+    Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
> -+    Cflags: -I${includedir}
> ++prefix=@CMAKE_INSTALL_PREFIX@
> ++exec_prefix=@CMAKE_INSTALL_PREFIX@
> ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
> ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
> ++
> ++Name: @PROJECT_NAME@
> ++Description: OpenGL and OpenGL ES shader front end and validator
> ++Requires:
> ++Version: @GLSLANG_VERSION@
> ++Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper
> ++Cflags: -I${includedir}
> 
> 
> 
> 
>