Some dependency issues
cover Some dependency issues
The following changes since commit e023620773df82ba1551bec7fb921e4fef01322e:
bitbake: utils: Fix multiprocessing pool reference (2013-06-14 22:01:09 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/trivial-fixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/trivial-fixes
Kai Kang (2):
strace: update depends
Add needed libx11 library for sato applications
meta/recipes-devtools/strace/strace_4.7.bb | 2 + .../files/link-with-new-binutils.patch | 41 +++++++++++++ .../matchbox-panel-2/matchbox-panel-2_git.bb | 3 +- .../sato-screenshot/files/add-needed-libx11.patch | 63 ++++++++++++++++++++ .../sato-screenshot/sato-screenshot_git.bb | 3 +- 5 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/matchbox-panel-2/files/link-with-new-binutils.patch create mode 100644 meta/recipes-sato/sato-screenshot/files/add-needed-libx11.patch
Signature · 1 line
1.7.5.4
PATCH 1/2 strace: update depends
Build strace with libaio and acl to support more features. Because no native libaio package, just add dependencies for target.
--- meta/recipes-devtools/strace/strace_4.7.bb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-devtools/strace/strace_4.7.bb +2 -0
@@ -5,6 +5,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7" PR = "r4" +DEPENDS_class-target += "libaio acl" + SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch \ file://0014-x32-update-syscall-table.patch \
Signature · 1 line
1.7.5.4
Re: [PATCH 1/2] strace: update depends
Quoted 2 lines · On 16 June 2013 16:16:25 Kai Kang <[email protected]> wrote:
Build strace with libaio and acl to support more features. Because no native libaio package, just add dependencies for target.
Do you mind updating to 4.8 while you touch it?
Thanks,
Sent with AquaMail for Android
http://www.aqua-mail.com
Re: [PATCH 1/2] strace: update depends
Quoted 7 lines · Bernhard Reutner-Fischer
Quoted 2 lines · On 16 June 2013 16:16:25 Kai Kang <[email protected]> wrote:
Build strace with libaio and acl to support more features. Because no native libaio package, just add dependencies for target.
Do you mind updating to 4.8 while you touch it?
Thanks,
OK, I'll check the new version of strace
Quoted 7 lines
Sent with AquaMail for Android
http://www.aqua-mail.com
Signature · 2 lines
Regards, Neil | Kai Kang
Re: [PATCH 1/2] strace: update depends
In reply to Kai KangQuoted 7 lines · Kai Kang
Build strace with libaio and acl to support more features. Because no native libaio package, just add dependencies for target.
Signed-off-by Kai Kang <[email protected]>--- meta/recipes-devtools/strace/strace_4.7.bb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
Shouldn't this be implemented like the other packages as PACKAGECONFIG options? That is how acl is handled elsewhere at least...
Cheers,
Richard
Quoted 13 lines
meta/recipes-devtools/strace/strace_4.7.bb +2
-0@@ -5,6 +5,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7" PR = "r4" +DEPENDS_class-target += "libaio acl" + SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch \ file://0014-x32-update-syscall-table.patch \
Re: [PATCH 1/2] strace: update depends
Quoted 10 lines · Richard Purdie
Quoted 7 lines · Kai Kang
Build strace with libaio and acl to support more features. Because no native libaio package, just add dependencies for target.
Signed-off-by Kai Kang <[email protected]>--- meta/recipes-devtools/strace/strace_4.7.bb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)Shouldn't this be implemented like the other packages as PACKAGECONFIG options? That is how acl is handled elsewhere at least...
Yes, PACKAGECONFIG is the right way. I'll send V2.
Thanks,
Kai
Quoted 20 lines
Cheers,
Richard
Quoted 13 lines
meta/recipes-devtools/strace/strace_4.7.bb +2
-0@@ -5,6 +5,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=124500c21e856f0912df29295ba104c7" PR = "r4" +DEPENDS_class-target += "libaio acl" + SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://0003-util-fix-building-when-glibc-has-a-stub-process_vm_r.patch \ file://0014-x32-update-syscall-table.patch \
Signature · 2 lines
Regards, Neil | Kai Kang
PATCH 2/2 Add needed libx11 library for sato applications
In reply to Kai KangFrom binutils-2.22, --copy-dt-needed-entries option is no longer enabled by default. Instead, --no-copy-dt-needed-entries is now the default option.
When use other toolchain than default toolchain, some sato applications may compiled failed that they need libx11 but don't link to it directly. So we should add needed libraries to avoid build these sato applications fail.
--- .../files/link-with-new-binutils.patch | 41 +++++++++++++ .../matchbox-panel-2/matchbox-panel-2_git.bb | 3 +- .../sato-screenshot/files/add-needed-libx11.patch | 63 ++++++++++++++++++++ .../sato-screenshot/sato-screenshot_git.bb | 3 +- 4 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/matchbox-panel-2/files/link-with-new-binutils.patch create mode 100644 meta/recipes-sato/sato-screenshot/files/add-needed-libx11.patch
meta/recipes-sato/matchbox-panel-2/files/link-with-new-binutils.patch new file +41 -0
@@ -0,0 +1,41 @@ +Subject: [PATCH] matchbox-panel-2: FTBFS with new binutils + +This bug is same as: +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555589 +Port debian/patches/linking-fix to fix matchbox-panel-2. + +Upstream-Status: pending + +Signed-off-by: Xin Ouyang <[email protected]> + +From binutils-2.22, --copy-dt-needed-entries option is no longer enabled by +default. Instead, --no-copy-dt-needed-entries is now the default option. + +For default toolchain, it includes tcmode-default.inc which requires as-needed.inc. +In as-needed.inc, ld option '--as-needed' is added to TARGET_LDFLAGS. That's why sato-screenshot +can be built successfully with default toolchain but failed with other toolchain. + +So we should add needed libraries to avoid build failed. + +Signed-off-by: Kai Kang <[email protected]> + +--- + matchbox-panel/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/matchbox-panel/Makefile.am b/matchbox-panel/Makefile.am +index 81e62c5..8046cd7 100644 +--- a/matchbox-panel/Makefile.am ++++ b/matchbox-panel/Makefile.am +@@ -12,7 +12,7 @@ bin_PROGRAMS = matchbox-panel + + matchbox_panel_SOURCES = mb-panel.c mb-panel-scaling-image.c + +-matchbox_panel_LDADD = $(MATCHBOX_PANEL_LIBS) ++matchbox_panel_LDADD = $(MATCHBOX_PANEL_LIBS) -lX11 + # This is required as gmodule-export in Poky doesn't have it + matchbox_panel_LDFLAGS = -Wl,--export-dynamic + +-- +1.7.11 +
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +2 -1
@@ -19,7 +19,8 @@ RPROVIDES_${PN} = "matchbox-panel" RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" -SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" +SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ + file://link-with-new-binutils.patch" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
meta/recipes-sato/sato-screenshot/files/add-needed-libx11.patch new file +63 -0
63 lines not on this page · raw message
meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb +2 -1
@@ -13,7 +13,8 @@ PV = "0.1+git${SRCPV}" PR = "r2" SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \ - file://fix_ldadd_order.patch" + file://fix_ldadd_order.patch \ + file://add-needed-libx11.patch" S = "${WORKDIR}/git"
Signature · 1 line
1.7.5.4
Re: [PATCH 2/2] Add needed libx11 library for sato applications
Quoted 7 lines · Kai Kang
From binutils-2.22, --copy-dt-needed-entries option is no longer enabled by default. Instead, --no-copy-dt-needed-entries is now the default option.
When use other toolchain than default toolchain, some sato applications may compiled failed that they need libx11 but don't link to it directly. So we should add needed libraries to avoid build these sato applications fail.
I've pushed both of these upstream (as they're maintained by Yocto), and after a build test will submit srcrev bumps instead.
Ross