[PATCH 0/3 v2] cleanup buildpaths for gnutls, curl, glib-2.0

[PATCH 0/3 v2] cleanup buildpaths for gnutls, curl, glib-2.0

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

V2 changes:

* limit sed logics to do_install_append_class-target()
* update commit logs for all three patches
 
The following changes since commit 4bc3f0994e68b3302a0523a3156dd0dca0cac7a0:

  bitbake: toaster: move clones into subdirectory (2015-09-29 14:11:39 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib wenzong/buildpaths
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/buildpaths

Wenzong Fan (3):
  glib-2.0: cleanup buildpaths from pkgconfig files
  curl: cleanup buildpaths from curl-config
  gnutls: cleanup buildpaths from gnutls.pc

 meta/recipes-core/glib-2.0/glib.inc      | 6 ++++++
 meta/recipes-support/curl/curl_7.44.0.bb | 5 +++++
 meta/recipes-support/gnutls/gnutls.inc   | 5 +++++
 3 files changed, 16 insertions(+)

-- 
1.9.1

[PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

For multilib build, PKG_CONFIG_SYSROOT_DIR will be injected in values
that are returned by 'pkg-config --libs xxx', such as for zlib:

  dev-shell# pkg-config --libs zlib
  -L/path/to/tmp/sysroots/qemux86-64/usr/lib64 -lz

The values used by configure to generate various files from templates.

For glib-2.0, the buildpaths should be cleaned up from:

* gio-2.0.pc:
  generated from gio-2.0.pc.in that includes @ZLIB_LIBS@

* gobject-2.0.pc:
  generated from gobject-2.0.pc.in that includes @LIBFFI_LIBS@

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 072f790..fb42eac 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -75,6 +75,12 @@ do_install_append () {
 	fi
 }
 
+do_install_append_class-target() {
+	# cleanup buildpaths from gio-2.0.pc, gobject-2.0.pc
+	sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${libdir}/pkgconfig/gio-2.0.pc
+	sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${libdir}/pkgconfig/gobject-2.0.pc
+}
+
 RDEPENDS_${PN}-ptest += "\
             gnome-desktop-testing \
             tzdata \
-- 
1.9.1

[PATCH 2/3 v2] curl: cleanup buildpaths from curl-config

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

curl-config will be installed to target, cleanup buildpaths in it:

* remove ${STAGING_DIR_HOST} from CC, CFLAGS ...

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-support/curl/curl_7.44.0.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-support/curl/curl_7.44.0.bb b/meta/recipes-support/curl/curl_7.44.0.bb
index b293303..f6d350e 100644
--- a/meta/recipes-support/curl/curl_7.44.0.bb
+++ b/meta/recipes-support/curl/curl_7.44.0.bb
@@ -45,6 +45,11 @@ do_install_append() {
 	oe_multilib_header curl/curlbuild.h
 }
 
+do_install_append_class-target() {
+	# cleanup buildpaths from curl-config
+	sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config
+}
+
 PACKAGES =+ "lib${BPN}"
 
 FILES_lib${BPN} = "${libdir}/lib*.so.*"
-- 
1.9.1

[PATCH 3/3 v2] gnutls: cleanup buildpaths from gnutls.pc

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

For multilib build, PKG_CONFIG_SYSROOT_DIR will be injected in values
that are returned by 'pkg-config --libs xxx', such as for zlib:

  dev-shell# pkg-config --libs zlib
  -L/path/to/tmp/sysroots/qemux86-64/usr/lib64 -lz

The values used by configure to generate various files from templates.

For gnutls, the buildpaths should be cleaned up from:

* gnutls.pc:
  generated from lib/gnutls.pc.in that includes @LTLIBZ@

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-support/gnutls/gnutls.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index e9b138a..3c8d4c9 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -38,6 +38,11 @@ PACKAGECONFIG ??= "zlib"
 PACKAGECONFIG[tpm] = "--with-tpm, --without-tpm, trousers"
 PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib"
 
+do_install_append_class-target() {
+	# cleanup buildpaths from gnutls.pc
+	sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${libdir}/pkgconfig/gnutls.pc
+}
+
 PACKAGES =+ "${PN}-openssl ${PN}-xx"
 
 FILES_${PN}-dev += "${bindir}/gnutls-cli-debug"
-- 
1.9.1

Re: [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files

[Burton, Ross]

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

On 30 September 2015 at 09:08, <wenzong.fan@windriver.com> wrote:

> For multilib build, PKG_CONFIG_SYSROOT_DIR will be injected in values
> that are returned by 'pkg-config --libs xxx', such as for zlib:
>

So why isn't this fixed in pkg-config?

Ross

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

Re: [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files

[Burton, Ross]

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

On 30 September 2015 at 10:45, Burton, Ross <ross.burton@intel.com> wrote:

> For multilib build, PKG_CONFIG_SYSROOT_DIR will be injected in values
>> that are returned by 'pkg-config --libs xxx', such as for zlib:
>>
>
> So why isn't this fixed in pkg-config?
>

I've just replicated this with a minimal test (build zlib, run pkg-config
--libs zlib in a devshell) for "normal" and multilib configurations and
this is clearly a bug in pkgconfig.  Please fix pkgconfig instead of
playing whack-a-mole with where the bug causes problems.

Ross

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