Multilib fixes
cover Multilib fixes
This represents a set of patches that address multilib issues and other problems discovered building lib32 world
The following changes since commit 75f470cd18d693a9a96d9849291c2c8de4dcbeb8:
qt4: Add space for _appends (2013-02-01 22:49:47 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib cmuscax/ml_patches
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=cmuscax/ml_patches
Constantin Musca (10):
enchant: use BPN instead of PN
sgml-common: use ${PN} instead of sgml-common
syslinux: use BPN instead of PN
console-tools: fix linking when using the multilib compiler
foomatic-filters: fix CUPS directory config
taglib: use LIB_SUFFIX in order to determine the correct baselib
run-postinsts: use BPN instead of PN
consolekit: add arch independent unpackaged files
gcc: target: fix libiberty removal
blktool: fix SRC_URI typo
.../fix-libconsole-linking.patch | 56 ++++++++++++++++++++++ .../console-tools/console-tools_0.3.2.bb | 3 +- meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | 6 +-- meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +- meta/recipes-devtools/gcc/gcc-package-target.inc | 4 +- .../sgml-common/sgml-common_0.6.3.bb | 4 +- meta/recipes-devtools/syslinux/syslinux_4.03.bb | 16 +++---- meta/recipes-extended/blktool/blktool_4-6.1.bb | 4 +- .../foomatic/foomatic-filters_4.0.17.bb | 7 +-- .../recipes-support/consolekit/consolekit_0.4.5.bb | 6 ++- meta/recipes-support/enchant/enchant_1.6.0.bb | 8 ++-- meta/recipes-support/taglib/taglib_1.8.bb | 4 +- 12 files changed, 89 insertions(+), 31 deletions(-) create mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
Signature · 1 line
1.7.11.7
PATCH 1/10 enchant: use BPN instead of PN
- use BPN (PN includes mlprefix) to package all files when building with multilib options
[YOCTO #3438]
--- meta/recipes-support/enchant/enchant_1.6.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-support/enchant/enchant_1.6.0.bb +4 -4
@@ -10,7 +10,7 @@ RDEPENDS_${PN} = "aspell" inherit autotools pkgconfig -PR = "r2" +PR = "r3" SRC_URI = "http://www.abisource.com/downloads/enchant/${PV}/enchant-${PV}.tar.gz"
@@ -19,8 +19,8 @@ SRC_URI[sha256sum] = "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03 EXTRA_OECONF = "--with-aspell-prefix=${STAGING_DIR_HOST}${prefix} --enable-aspell --disable-binreloc" -FILES_${PN} = "${bindir} ${libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}/*.so" -FILES_${PN}-dev += "${libdir}/${PN}/*{SOLIBSDEV} ${libdir}/${PN}/*.la" -FILES_${PN}-staticdev += "${libdir}/${PN}/*.a" +FILES_${PN} = "${bindir} ${libdir}/*${SOLIBS} ${datadir}/${BPN} ${libdir}/${BPN}/*.so" +FILES_${PN}-dev += "${libdir}/${BPN}/*{SOLIBSDEV} ${libdir}/${BPN}/*.la" +FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a" export CXXFLAGS += " -L${STAGING_LIBDIR} -lstdc++ "
Signature · 1 line
1.7.11.7
PATCH 2/10 sgml-common: use ${PN} instead of sgml-common
In reply to Constantin MuscaFix the following warning:
WARNING: QA Issue: lib32-sgml-common: Files/directories were installed but not shipped
/etc
/etc/sgml
/etc/sgml/sgml.conf
/usr/bin
/usr/bin/install-catalog
/usr/bin/sgmlwhich
[YOCTO #3438]
--- meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb +2 -2
@@ -13,7 +13,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b" SECTION = "base" -PR = "r0" +PR = "r1" SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-${PV}.tgz \ file://autohell.patch \
@@ -29,7 +29,7 @@ do_compile_append() { sed -i -e 's|\([ "]\+\)/etc/sgml|\1${sysconfdir}/sgml|g' bin/install-catalog } -FILES_sgml-common_append = " ${datadir}/sgml" +FILES_${PN} += "${datadir}/sgml" pkg_postinst_${PN}() { install-catalog \
Signature · 1 line
1.7.11.7
PATCH 3/10 syslinux: use BPN instead of PN
In reply to Constantin MuscaFix the following warning:
WARNING: QA Issue: lib32-syslinux: Files/directories were installed but not shipped
/usr/lib
/usr/share/syslinux
/usr/share/syslinux/com32
/usr/share/syslinux/com32/libcom32gpl.a /usr/share/syslinux/com32/libcom32.a
...
[YOCTO #3438]
--- meta/recipes-devtools/syslinux/syslinux_4.03.bb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
meta/recipes-devtools/syslinux/syslinux_4.03.bb +8 -8
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ # If you really want to run syslinux, you need mtools. We just want the # ldlinux.* stuff for now, so skip mtools-native DEPENDS = "nasm-native" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \ file://cross-build.patch \
@@ -54,12 +54,12 @@ RDEPENDS_${PN} += "mtools" FILES_${PN} = "${bindir}/syslinux" FILES_${PN}-extlinux = "${sbindir}/extlinux" -FILES_${PN}-mbr = "${libdir}/${PN}/mbr.bin" -FILES_${PN}-chain = "${libdir}/${PN}/chain.c32" -FILES_${PN}-isolinux = "${libdir}/${PN}/isolinux.bin" -FILES_${PN}-pxelinux = "${libdir}/${PN}/pxelinux.0" -FILES_${PN}-dev += "${datadir}/${PN}/com32/lib*${SOLIBS} ${datadir}/${PN}/com32/include ${datadir}/${PN}/com32/com32.ld" -FILES_${PN}-staticdev += "${datadir}/${PN}/com32/lib*.a ${libdir}/${PN}/com32/lib*.a" -FILES_${PN}-misc = "${libdir}/${PN}/* ${bindir}/*" +FILES_${PN}-mbr = "${libdir}/${BPN}/mbr.bin" +FILES_${PN}-chain = "${libdir}/${BPN}/chain.c32" +FILES_${PN}-isolinux = "${libdir}/${BPN}/isolinux.bin" +FILES_${PN}-pxelinux = "${libdir}/${BPN}/pxelinux.0" +FILES_${PN}-dev += "${datadir}/${BPN}/com32/lib*${SOLIBS} ${datadir}/${BPN}/com32/include ${datadir}/${BPN}/com32/com32.ld" +FILES_${PN}-staticdev += "${datadir}/${BPN}/com32/lib*.a ${libdir}/${BPN}/com32/lib*.a" +FILES_${PN}-misc = "${libdir}/${BPN}/* ${bindir}/*" BBCLASSEXTEND = "native"
Signature · 1 line
1.7.11.7
PATCH 4/10 console-tools: fix linking when using the multilib compiler
In reply to Constantin Muscafix-libconsole-link.patch: add patch for fixing libconsole linking problems when using multilib gcc
--- .../fix-libconsole-linking.patch | 56 ++++++++++++++++++++++ .../console-tools/console-tools_0.3.2.bb | 3 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch new file +56 -0
@@ -0,0 +1,56 @@ +Fix the following error detected with i586-pokymllib32-linux-gcc (the +multilib x86-64 lib32 compiler): + ../lib/ctutils/.libs/libctutils.so: undefined reference to `get_kernel_sfm' + collect2: error: ld returned 1 exit status + +It seems that libctutils.so (the library that uses get_kernel_sfm) must +be stated before libconsole.so (the library that exports the function) when +using multilib gcc + +Upstream-Status: Pending +Signed-off-by: Constantin Musca <[email protected]> + +Index: console-tools-0.3.2/fontfiletools/Makefile.am +=================================================================== +--- console-tools-0.3.2.orig/fontfiletools/Makefile.am ++++ console-tools-0.3.2/fontfiletools/Makefile.am +@@ -10,5 +10,5 @@ EXTRA_DIST = fonts2virfont.c virfont.h + + # libconsole is needed by ctutils + LDADD = ../lib/ctlocal/libctlocal.a ../lib/cfont/libcfont.la \ +- ../lib/console/libconsole.la \ +- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la ++ ../lib/ctutils/libctutils.la \ ++ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la +Index: console-tools-0.3.2/vttools/Makefile.am +=================================================================== +--- console-tools-0.3.2.orig/vttools/Makefile.am ++++ console-tools-0.3.2/vttools/Makefile.am +@@ -7,9 +7,9 @@ bin_PROGRAMS = chvt deallocvt writevt fg + vcstime vt-is-UTF8 openvt @RESIZECONS@ + EXTRA_PROGRAMS = resizecons + +-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \ ++LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \ + ../lib/cfont/libcfont.la \ +- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la ++ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la + + vcstime_LDADD = ../lib/ctlocal/libctlocal.a + screendump_LDADD = ../lib/ctlocal/libctlocal.a +Index: console-tools-0.3.2/kbdtools/Makefile.am +=================================================================== +--- console-tools-0.3.2.orig/kbdtools/Makefile.am ++++ console-tools-0.3.2/kbdtools/Makefile.am +@@ -15,9 +15,9 @@ EXTRA_PROGRAMS = getkeycodes setkeycodes + loadkeys_SOURCES = loadkeys.y analyze.l + + YFLAGS = -d +-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \ ++LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \ + ../lib/cfont/libcfont.la \ +- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la ++ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la + + loadkeys_LDADD = $(LDADD) @LEXLIB@ +
meta/recipes-core/console-tools/console-tools_0.3.2.bb +2 -1
@@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9" SUMMARY = "Allows you to set-up and manipulate the Linux console." DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files." -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://codepage.patch \
@@ -12,6 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://kbdrate.patch \ file://uclibc-fileno.patch \ file://nodocs.patch \ + file://fix-libconsole-linking.patch \ file://lcmessage.m4 \ file://Makevars"
Signature · 1 line
1.7.11.7
PATCH 5/10 foomatic-filters: fix CUPS directory config
In reply to Constantin Musca- use CUPS_SERVERBIN to configure the CUPS directory
- the removed variables are not used anymore
Fix the following warning:
WARNING: QA Issue: foomatic-filters: Files/directories were installed but not shipped
/usr/lib64
/usr/lib64/cups
/usr/lib64/cups/filter
/usr/lib64/cups/backend
/usr/lib64/cups/filter/foomatic-rip
/usr/lib64/cups/backend/beh
--- meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb +2 -5
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \ " DEPENDS += "cups perl libxml2" -PR = "r0" +PR = "r1" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
@@ -26,10 +26,7 @@ EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops" do_configure_prepend() { export PERL="${bindir}/env perl" - export LIB_CUPS=${exec_prefix}/lib/cups # /usr/lib NOT libdir - export CUPS_BACKENDS=${exec_prefix}/lib/cups/backend # /usr/lib NOT libdir - export CUPS_FILTERS=${exec_prefix}/lib/cups/filter # /usr/lib NOT libdir - export CUPS_PPDS=${datadir}/cups/model + export CUPS_SERVERBIN=${exec_prefix}/lib/cups # /usr/lib NOT libdir } do_install_append_linuxstdbase() {
Signature · 1 line
1.7.11.7
PATCH 6/10 taglib: use LIB_SUFFIX in order to determine the correct baselib
In reply to Constantin MuscaWARNING: QA Issue: taglib: Files/directories were installed but not shipped
/usr/lib
/usr/lib/libtag.so
/usr/lib/libtag.so.1.12.0
/usr/lib/libtag.so.1
/usr/lib/libtag_c.so.0.0.0
/usr/lib/libtag_c.so
/usr/lib/libtag_c.so.0
...
--- meta/recipes-support/taglib/taglib_1.8.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-support/taglib/taglib_1.8.bb +3 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" -PR = "r0" +PR = "r1" # http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz SRC_URI = "https://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz \ "
@@ -21,6 +21,8 @@ inherit cmake pkgconfig binconfig PACKAGES =+ "${PN}-c" FILES_${PN}-c = "${libdir}/libtag_c.so.*" +EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')}" + do_configure_prepend () { rm -f ${S}/admin/ltmain.sh rm -f ${S}/admin/libtool.m4.in
Signature · 1 line
1.7.11.7
PATCH 7/10 run-postinsts: use BPN instead of PN
In reply to Constantin MuscaFix the following warning:
WARNING: QA Issue: lib32-run-postinsts: Files/directories were installed but not shipped
/usr/share/lib32-run-postinsts /usr/share/lib32-run-postinsts/run-postinsts.awk
[YOCTO #3438]
--- meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/dpkg/run-postinsts_1.0.bb +3 -3
@@ -1,6 +1,6 @@ DESCRIPTION = "Run postinstall scripts on device using awk" SECTION = "devel" -PR = "r8" +PR = "r9" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -24,6 +24,6 @@ do_install() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/run-postinsts ${D}${sysconfdir}/init.d/ - install -d ${D}${datadir}/${PN}/ - install -m 0644 ${WORKDIR}/run-postinsts.awk ${D}${datadir}/${PN}/ + install -d ${D}${datadir}/${BPN}/ + install -m 0644 ${WORKDIR}/run-postinsts.awk ${D}${datadir}/${BPN}/ }
Signature · 1 line
1.7.11.7
PATCH 8/10 consolekit: add arch independent unpackaged files
In reply to Constantin MuscaFix the following warning:
WARNING: QA Issue: consolekit: Files/directories were installed but not shipped
/usr/lib
/usr/lib/ConsoleKit
/usr/lib/ConsoleKit/run-seat.d
/usr/lib/ConsoleKit/scripts
/usr/lib/ConsoleKit/run-session.d /usr/lib/ConsoleKit/scripts/ck-system-restart /usr/lib/ConsoleKit/scripts/ck-system-stop
--- meta/recipes-support/consolekit/consolekit_0.4.5.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-support/consolekit/consolekit_0.4.5.bb +4 -2
@@ -2,7 +2,7 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit" BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit" -PR = "r9" +PR = "r10" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
@@ -29,7 +29,9 @@ EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${systemd_unitdir}/sys ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \ " -FILES_${PN} += "${localstatedir}/log/ConsoleKit ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" +FILES_${PN} += "${localstatedir}/log/ConsoleKit ${exec_prefix}/lib/ConsoleKit \ + ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ + ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" FILES_${PN}-dbg += "${base_libdir}/security/.debug" PACKAGES =+ "pam-plugin-ck-connector"
Signature · 1 line
1.7.11.7
PATCH 9/10 gcc: target: fix libiberty removal
In reply to Constantin Musca- use ${libdir} instead of ${exec_prefix}/lib
Fix the following warning:
WARNING: QA Issue: gcc: Files/directories were installed but not shipped
/usr/lib64/libiberty.a
--- meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +- meta/recipes-devtools/gcc/gcc-package-target.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/gcc/gcc-4.7.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r15" +PR = "r16" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.7.1
meta/recipes-devtools/gcc/gcc-package-target.inc +2 -2
@@ -115,8 +115,8 @@ do_install () { rm -f *gcc-?.?* # We use libiberty from binutils - find ${D}${exec_prefix}/lib -name libiberty.a | xargs rm -f - find ${D}${exec_prefix}/lib -name libiberty.h | xargs rm -f + find ${D}${libdir} -name libiberty.a | xargs rm -f + find ${D}${libdir} -name libiberty.h | xargs rm -f # Not sure why we end up with these but we don't want them... rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
Signature · 1 line
1.7.11.7
PATCH 10/10 blktool: fix SRC_URI typo
In reply to Constantin Musca--- meta/recipes-extended/blktool/blktool_4-6.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/blktool/blktool_4-6.1.bb +2 -2
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://blktool.c;beginline=7;endline=8;md5=a5e798ea98fd50972088968a15e5f373" DEPENDS = "glib-2.0" -PR = "r0" +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \ ${DEBIAN_MIRROR}/main/b/blktool/blktool_4-6.1.diff.gz;apply=yes;name=patch"
@@ -16,7 +16,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz;name=tarball \ SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40" SRC_URI[tarball.sha256sum] = "b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764" -RC_URI[patch.md5sum] = "cf605a683d54d1fbcb35b940076ddb0c" +SRC_URI[patch.md5sum] = "cf605a683d54d1fbcb35b940076ddb0c" SRC_URI[patch.sha256sum] = "d7923527e1a00984620ab307c9047a653d7ae2856cd20a82de8a33328f381ae3" S = "${WORKDIR}/${BPN}-4.orig"
Signature · 1 line
1.7.11.7