* [PATCH 2/6] libxslt: multilib_header xsltconfig.h
2020-02-15 4:42 [PATCH 1/6] bind: add mulitlib_header for platform.h Jeremy Puhlman
@ 2020-02-15 4:42 ` Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 3/6] libsndfile1: mutlilibize sndfile.h Jeremy Puhlman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeremy Puhlman @ 2020-02-15 4:42 UTC (permalink / raw)
To: openembedded-core
From: "Jeremy A. Puhlman" <jpuhlman@mvista.com>
xsltconfig.h is generated and can be different between multilibs
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
meta/recipes-support/libxslt/libxslt_1.1.34.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/meta/recipes-support/libxslt/libxslt_1.1.34.bb
index ad37b5a44a..1961bb5b31 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.34.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.34.bb
@@ -20,7 +20,7 @@ S = "${WORKDIR}/libxslt-${PV}"
BINCONFIG = "${bindir}/xslt-config"
-inherit autotools pkgconfig binconfig-disabled lib_package
+inherit autotools pkgconfig binconfig-disabled lib_package multilib_header
do_configure_prepend () {
# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header.
@@ -43,6 +43,10 @@ do_install_append_class-native () {
create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog
}
+do_install_append () {
+ oe_multilib_header libxslt/xsltconfig.h
+}
+
FILES_${PN} += "${libdir}/libxslt-plugins"
FILES_${PN}-dev += "${libdir}/xsltConf.sh"
--
2.13.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/6] libsndfile1: mutlilibize sndfile.h
2020-02-15 4:42 [PATCH 1/6] bind: add mulitlib_header for platform.h Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 2/6] libxslt: multilib_header xsltconfig.h Jeremy Puhlman
@ 2020-02-15 4:42 ` Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 4/6] libassuan: multilib header for assuan.h Jeremy Puhlman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeremy Puhlman @ 2020-02-15 4:42 UTC (permalink / raw)
To: openembedded-core
From: "Jeremy A. Puhlman" <jpuhlman@mvista.com>
sndfile.h can differ depending on the combined architectures.
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
index 7855008f3d..b100108766 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
@@ -32,7 +32,11 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}"
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
PACKAGECONFIG[regtest] = "--enable-sqlite,--disable-sqlite,sqlite3"
-inherit autotools lib_package pkgconfig
+inherit autotools lib_package pkgconfig multilib_header
+
+do_install_append() {
+ oe_multilib_header sndfile.h
+}
# This can't be replicated and is just a memory leak.
# https://github.com/erikd/libsndfile/issues/398
--
2.13.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/6] libassuan: multilib header for assuan.h
2020-02-15 4:42 [PATCH 1/6] bind: add mulitlib_header for platform.h Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 2/6] libxslt: multilib_header xsltconfig.h Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 3/6] libsndfile1: mutlilibize sndfile.h Jeremy Puhlman
@ 2020-02-15 4:42 ` Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 5/6] subversion: move pkgconfig files in to libdir Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 6/6] x11perf: make x11perfcomp a mulitlib script Jeremy Puhlman
4 siblings, 0 replies; 6+ messages in thread
From: Jeremy Puhlman @ 2020-02-15 4:42 UTC (permalink / raw)
To: openembedded-core
From: "Jeremy A. Puhlman" <jpuhlman@mvista.com>
assuan.h is generated and can differ between mutlilibs.
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
meta/recipes-support/libassuan/libassuan_2.5.3.bb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/libassuan/libassuan_2.5.3.bb b/meta/recipes-support/libassuan/libassuan_2.5.3.bb
index 6fb3d2f3a4..52b4c0f1b9 100644
--- a/meta/recipes-support/libassuan/libassuan_2.5.3.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.5.3.bb
@@ -22,11 +22,15 @@ SRC_URI[sha256sum] = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f7
BINCONFIG = "${bindir}/libassuan-config"
-inherit autotools texinfo binconfig-disabled pkgconfig
+inherit autotools texinfo binconfig-disabled pkgconfig multilib_header
do_configure_prepend () {
# Else these could be used in preference to those in aclocal-copy
rm -f ${S}/m4/*.m4
}
+do_install_append () {
+ oe_multilib_header assuan.h
+}
+
BBCLASSEXTEND = "native nativesdk"
--
2.13.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/6] subversion: move pkgconfig files in to libdir
2020-02-15 4:42 [PATCH 1/6] bind: add mulitlib_header for platform.h Jeremy Puhlman
` (2 preceding siblings ...)
2020-02-15 4:42 ` [PATCH 4/6] libassuan: multilib header for assuan.h Jeremy Puhlman
@ 2020-02-15 4:42 ` Jeremy Puhlman
2020-02-15 4:42 ` [PATCH 6/6] x11perf: make x11perfcomp a mulitlib script Jeremy Puhlman
4 siblings, 0 replies; 6+ messages in thread
From: Jeremy Puhlman @ 2020-02-15 4:42 UTC (permalink / raw)
To: openembedded-core
From: "Jeremy A. Puhlman" <jpuhlman@mvista.com>
All of the .pc files contain the path to ${libdir} which fails
in a multilib rpm image.
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
meta/recipes-devtools/subversion/subversion_1.13.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/subversion/subversion_1.13.0.bb b/meta/recipes-devtools/subversion/subversion_1.13.0.bb
index 9c1281a63e..6879f1249f 100644
--- a/meta/recipes-devtools/subversion/subversion_1.13.0.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.13.0.bb
@@ -37,6 +37,8 @@ EXTRA_OECONF = " \
ac_cv_path_RUBY=none \
"
+EXTRA_OEMAKE += "pkgconfig_dir=${libdir}/pkgconfig"
+
acpaths = "-I build/ -I build/ac-macros/"
CPPFLAGS += "-P"
--
2.13.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 6/6] x11perf: make x11perfcomp a mulitlib script
2020-02-15 4:42 [PATCH 1/6] bind: add mulitlib_header for platform.h Jeremy Puhlman
` (3 preceding siblings ...)
2020-02-15 4:42 ` [PATCH 5/6] subversion: move pkgconfig files in to libdir Jeremy Puhlman
@ 2020-02-15 4:42 ` Jeremy Puhlman
4 siblings, 0 replies; 6+ messages in thread
From: Jeremy Puhlman @ 2020-02-15 4:42 UTC (permalink / raw)
To: openembedded-core
From: "Jeremy A. Puhlman" <jpuhlman@mvista.com>
x11perfcomp encodes the library paths in the script.
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb
index 33c0c8a95c..c4d443bfb9 100644
--- a/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb
+++ b/meta/recipes-graphics/xorg-app/x11perf_1.6.1.bb
@@ -13,6 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \
PE = "1"
+inherit multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/x11perfcomp"
+
do_install_append_class-target () {
sed -i -e 's:${HOSTTOOLS_DIR}/::g' ${D}${bindir}/x11perfcomp
}
--
2.13.3
^ permalink raw reply related [flat|nested] 6+ messages in thread