From cf6c5e221c1e1c73bd908bf36d9a09d0fcb02ba8 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 22 Oct 2016 13:06:09 +0200 Subject: [PATCH] pkg-config files: fix qa error | ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: QA Issue: gstreamer-egl-1.0.pc failed sanity test (tmpdir) in path | /build/krm/oe-core_V2.6.2/build/tmp-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/libgstnvegl/21.5.0-r5/sysroot-destdir/usr/lib/pkgconfig [pkgconfig] | ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: QA staging was broken by the package built above | ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: Function failed: do_qa_staging Signed-off-by: Max Krummenacher --- configure.ac | 3 +++ pkgconfig/Makefile.in | 1 + pkgconfig/gstreamer-egl-uninstalled.pc.in | 2 +- pkgconfig/gstreamer-egl.pc.in | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7df8267..62ceb40 100644 --- a/configure.ac +++ b/configure.ac @@ -367,6 +367,7 @@ case "$EGL_WINDOW_SYSTEM" in HAVE_EGL="yes" EGL_LIBS="-lEGL" EGL_CFLAGS="" + EGL_CFLAGS_SYSROOT="" ] ) ] @@ -383,6 +384,8 @@ case "$EGL_WINDOW_SYSTEM" in else + AC_ARG_VAR(PKG_CONFIG_SYSROOT_DIR, "OE path to sysroot") AC_DEFINE(USE_EGL_X11, [1], [Use X11 EGL window system]) EGL_CFLAGS="$EGL_CFLAGS $X11_CFLAGS" + EGL_CFLAGS_SYSROOT=`echo $EGL_CFLAGS|sed "s;${PKG_CONFIG_SYSROOT_DIR};;"` - EGL_LIBS="$EGL_LIBS $X11_LIBS" + EGL_LIBS=`echo "$EGL_LIBS $X11_LIBS"|sed "s;${PKG_CONFIG_SYSROOT_DIR};;"` fi fi @@ -398,6 +401,7 @@ esac AC_SUBST(EGL_LIBS) AC_SUBST(EGL_CFLAGS) +AC_SUBST(EGL_CFLAGS_SYSROOT) AM_CONDITIONAL(HAVE_EGL, test x"$HAVE_EGL" = x"yes") dnl *** ext plug-ins *** diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in index f420abf..9e25a26 100644 --- a/pkgconfig/Makefile.in +++ b/pkgconfig/Makefile.in @@ -212,6 +212,7 @@ ECHO_T = @ECHO_T@ EGLGLES_CFLAGS = @EGLGLES_CFLAGS@ EGLGLES_LIBS = @EGLGLES_LIBS@ EGL_CFLAGS = @EGL_CFLAGS@ +EGL_CFLAGS_SYSROOT = @EGL_CFLAGS_SYSROOT@ EGL_LIBS = @EGL_LIBS@ EGREP = @EGREP@ ERROR_CFLAGS = @ERROR_CFLAGS@ diff --git a/pkgconfig/gstreamer-egl-uninstalled.pc.in b/pkgconfig/gstreamer-egl-uninstalled.pc.in index ae9d406..271123e 100644 --- a/pkgconfig/gstreamer-egl-uninstalled.pc.in +++ b/pkgconfig/gstreamer-egl-uninstalled.pc.in @@ -8,5 +8,5 @@ Description: GStreamer EGL Library, uninstalled Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ Libs: -L${libdir} ${libdir}/libgstnvegl-@GST_API_VERSION@.la @EGL_LIBS@ -Cflags: -I${includedir} @EGL_CFLAGS@ +Cflags: -I${includedir} @EGL_CFLAGS_SYSROOT@ diff --git a/pkgconfig/gstreamer-egl.pc.in b/pkgconfig/gstreamer-egl.pc.in index bfc7994..eea84af 100644 --- a/pkgconfig/gstreamer-egl.pc.in +++ b/pkgconfig/gstreamer-egl.pc.in @@ -8,5 +8,5 @@ Description: GStreamer EGL library Requires: gstreamer-@GST_API_VERSION@ Version: @VERSION@ Libs: -L${libdir} -lgstegl-@GST_API_VERSION@ @EGL_LIBS@ -Cflags: -I${includedir} @EGL_CFLAGS@ +Cflags: -I${includedir} @EGL_CFLAGS_SYSROOT@ -- 2.5.5