* [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files
2015-09-30 8:08 [PATCH 0/3 v2] cleanup buildpaths for gnutls, curl, glib-2.0 wenzong.fan
@ 2015-09-30 8:08 ` wenzong.fan
2015-09-30 9:45 ` Burton, Ross
2015-09-30 8:08 ` [PATCH 2/3 v2] curl: cleanup buildpaths from curl-config wenzong.fan
2015-09-30 8:09 ` [PATCH 3/3 v2] gnutls: cleanup buildpaths from gnutls.pc wenzong.fan
2 siblings, 1 reply; 6+ messages in thread
From: wenzong.fan @ 2015-09-30 8:08 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files
2015-09-30 8:08 ` [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files wenzong.fan
@ 2015-09-30 9:45 ` Burton, Ross
2015-10-05 20:09 ` Burton, Ross
0 siblings, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2015-09-30 9:45 UTC (permalink / raw)
To: wenzong fan; +Cc: OE-core
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files
2015-09-30 9:45 ` Burton, Ross
@ 2015-10-05 20:09 ` Burton, Ross
0 siblings, 0 replies; 6+ messages in thread
From: Burton, Ross @ 2015-10-05 20:09 UTC (permalink / raw)
To: wenzong fan; +Cc: OE-core
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3 v2] curl: cleanup buildpaths from curl-config
2015-09-30 8:08 [PATCH 0/3 v2] cleanup buildpaths for gnutls, curl, glib-2.0 wenzong.fan
2015-09-30 8:08 ` [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files wenzong.fan
@ 2015-09-30 8:08 ` wenzong.fan
2015-09-30 8:09 ` [PATCH 3/3 v2] gnutls: cleanup buildpaths from gnutls.pc wenzong.fan
2 siblings, 0 replies; 6+ messages in thread
From: wenzong.fan @ 2015-09-30 8:08 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3 v2] gnutls: cleanup buildpaths from gnutls.pc
2015-09-30 8:08 [PATCH 0/3 v2] cleanup buildpaths for gnutls, curl, glib-2.0 wenzong.fan
2015-09-30 8:08 ` [PATCH 1/3 v2] glib-2.0: cleanup buildpaths from pkgconfig files wenzong.fan
2015-09-30 8:08 ` [PATCH 2/3 v2] curl: cleanup buildpaths from curl-config wenzong.fan
@ 2015-09-30 8:09 ` wenzong.fan
2 siblings, 0 replies; 6+ messages in thread
From: wenzong.fan @ 2015-09-30 8:09 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 6+ messages in thread