[PATCH 0/2] Some dependency issues

[PATCH 0/2] Some dependency issues

[Kai Kang]

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

-- 
1.7.5.4

[PATCH 1/2] strace: update depends

[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 <kai.kang@windriver.com>
---
 meta/recipes-devtools/strace/strace_4.7.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/strace/strace_4.7.bb b/meta/recipes-devtools/strace/strace_4.7.bb
index e360e63..bcc7bd9 100644
--- a/meta/recipes-devtools/strace/strace_4.7.bb
+++ b/meta/recipes-devtools/strace/strace_4.7.bb
@@ -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 \
-- 
1.7.5.4

[PATCH 2/2] Add needed libx11 library for sato applications

[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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../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

diff --git a/meta/recipes-sato/matchbox-panel-2/files/link-with-new-binutils.patch b/meta/recipes-sato/matchbox-panel-2/files/link-with-new-binutils.patch
new file mode 100644
index 0000000..b81d07c
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/files/link-with-new-binutils.patch
@@ -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 <Xin.Ouyang@windriver.com>
+
+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 <kai.kang@windriver.com>
+
+---
+ 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
+
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 1160b87..37c1e7b 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -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)}"
diff --git a/meta/recipes-sato/sato-screenshot/files/add-needed-libx11.patch b/meta/recipes-sato/sato-screenshot/files/add-needed-libx11.patch
new file mode 100644
index 0000000..a679949
--- /dev/null
+++ b/meta/recipes-sato/sato-screenshot/files/add-needed-libx11.patch
@@ -0,0 +1,63 @@
+Subject: [PATCH] sato-screenshot: add needed libx11
+
+Upstream-Status: pending
+
+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.
+
+So we should add needed libraries to avoid build these failures.
+
+xxx/bin/ld: note: 'XQueryTree' is defined in DSO
+  proj/bitbake_build/tmp/sysroots/qemumips/hard-float/usr/lib/libX11.so.6 so
+  try adding it to the linker command line
+proj/bitbake_build/tmp/sysroots/qemumips/hard-float/usr/lib/libX11.so.6:
+  could not read symbols: Invalid operation
+collect2: ld returned 1 exit status
+
+Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
+
+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.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+---
+ Makefile.am  | 4 ++--
+ configure.ac | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3623b6e..f1e3ae9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,7 +13,7 @@ appletdir = $(libdir)/matchbox-panel
+ applet_LTLIBRARIES = libscreenshot.la
+ libscreenshot_la_SOURCES = applet.c
+ libscreenshot_la_LDFLAGS = -avoid-version
+-libscreenshot_la_LIBADD = $(GTK_LIBS) $(MBAPP_LIBS) libshot.la
++libscreenshot_la_LIBADD = $(GTK_LIBS) $(MBAPP_LIBS) libshot.la $(X11_LIBS)
+ 
+ # The icon for the panel applet.
+ icondir = $(datadir)/pixmaps
+@@ -23,4 +23,4 @@ endif
+ # A standalone tool for running from a terminal and scripts
+ bin_PROGRAMS = screenshot
+ screenshot_SOURCES = main.c
+-screenshot_LDADD = libshot.la $(GTK_LIBS)
++screenshot_LDADD = libshot.la $(GTK_LIBS) $(X11_LIBS)
+diff --git a/configure.ac b/configure.ac
+index 9e084c1..868ca07 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,6 +10,7 @@ AC_PROG_CC
+ AC_STDC_HEADERS
+ AC_PROG_LIBTOOL
+ 
++PKG_CHECK_MODULES(X11, x11)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
+ 
+ MB_APPLET="yes"
+-- 
+1.7.11
+
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
index ff92142..6c5861f 100644
--- a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -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"
 
-- 
1.7.5.4

Re: [PATCH 1/2] strace: update depends

[Bernhard Reutner-Fischer]

On 16 June 2013 16:16:25 Kai Kang <kai.kang@windriver.com> 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

[Kang Kai]

On 2013年06月17日 15:15, Bernhard Reutner-Fischer wrote:
> On 16 June 2013 16:16:25 Kai Kang <kai.kang@windriver.com> 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

>
> Sent with AquaMail for Android
> http://www.aqua-mail.com
>
>
>
>


-- 
Regards,
Neil | Kai Kang

Re: [PATCH 1/2] strace: update depends

[Richard Purdie]

On Sun, 2013-06-16 at 22:16 +0800, Kai Kang wrote:
> 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 <kai.kang@windriver.com>
> ---
>  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

> diff --git a/meta/recipes-devtools/strace/strace_4.7.bb b/meta/recipes-devtools/strace/strace_4.7.bb
> index e360e63..bcc7bd9 100644
> --- a/meta/recipes-devtools/strace/strace_4.7.bb
> +++ b/meta/recipes-devtools/strace/strace_4.7.bb
> @@ -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 2/2] Add needed libx11 library for sato applications

[Burton, Ross]

On 16 June 2013 15:16, Kai Kang <kai.kang@windriver.com> wrote:
> 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

Re: [PATCH 1/2] strace: update depends

[Kang Kai]

On 2013年06月17日 23:11, Richard Purdie wrote:
> On Sun, 2013-06-16 at 22:16 +0800, Kai Kang wrote:
>> 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 <kai.kang@windriver.com>
>> ---
>>   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

>
> Cheers,
>
> Richard
>
>> diff --git a/meta/recipes-devtools/strace/strace_4.7.bb b/meta/recipes-devtools/strace/strace_4.7.bb
>> index e360e63..bcc7bd9 100644
>> --- a/meta/recipes-devtools/strace/strace_4.7.bb
>> +++ b/meta/recipes-devtools/strace/strace_4.7.bb
>> @@ -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 \
>
>


-- 
Regards,
Neil | Kai Kang