Patchwork [1/1] crosstool-ng: Fixed RDEPENDS for ltrace

login
register
mail settings
Submitter Kim Bøndergaard
Date Nov. 6, 2013, 10:34 a.m.
Message ID <83ea4f33c80ae20481c3f3811ecbaa55d3ec51bb.1383733821.git.kibo@prevas.dk>
Download mbox | patch
Permalink /patch/288821/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Kim Bøndergaard - Nov. 6, 2013, 10:34 a.m.
---
 recipes/crosstool-ng/gcc-package.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Esben Haabendal - Nov. 18, 2013, 8:54 p.m.
Kim Bøndergaard <kibo@prevas.dk> writes:

> ---
>  recipes/crosstool-ng/gcc-package.inc | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/recipes/crosstool-ng/gcc-package.inc b/recipes/crosstool-ng/gcc-package.inc
> index 0b38e1f..8d0ccff 100644
> --- a/recipes/crosstool-ng/gcc-package.inc
> +++ b/recipes/crosstool-ng/gcc-package.inc
> @@ -4,17 +4,17 @@ inherit auto-package-libs
>  AUTO_PACKAGE_LIBS = "gcc stdc++ supc++ m"
>  AUTO_PACKAGE_LIBS:>TARGET_LIBC_glibc = " \
>    dl resolv util crypt pthread thread_db bfd rt nsl \
> -  anl BrokenLocale memusage pcprofile SegFault \
> +  anl BrokenLocale memusage pcprofile SegFault elf \
>    nss_files nss_dns nss_compat nss_nis nss_nisplus nss_hesiod inproctrace"
>  AUTO_PACKAGE_LIBS:>TARGET_LIBC_uclibc = " \
> -  dl resolv util crypt pthread thread_db bfd rt nsl ubacktrace"
> +  dl resolv util crypt pthread thread_db bfd rt nsl ubacktrace elf"
>  AUTO_PACKAGE_LIBS:>TARGET_LIBC_mingw = " pdcurses"
>  AUTO_PACKAGE_LIBS:>USE_toolchain_dmalloc = " \
>    dmalloc dmallocxx dmallocth dmallocthcxx"
>  AUTO_PACKAGE_LIBS_PKGPREFIX = "sysroot-lib"
>  AUTO_PACKAGE_LIBS_LIBDIR = "\
>  ${base_prefix}/${TARGET_ARCH}/sysroot${target_base_libdir}:lib::.so,.so.*,-*.so: \
> -${base_prefix}/${TARGET_ARCH}/sysroot${target_libdir}:lib:::.so,.a,_nonshared.a,.la \
> +${base_prefix}/${TARGET_ARCH}/sysroot${target_libdir}:lib::.so.*:.so,.a,_nonshared.a,.la \

Is this change related to the libelf split?  I don't see any lib*.so.*
files in sysroot/usr/lib, at least not for the
arm-cortexa9-linux-gnueabi cross I tested with.

>  ${base_prefix}/${TARGET_ARCH}/debug-root${target_libdir}:lib::.so,.so.*,-*.so: \
>  "
>  AUTO_PACKAGE_LIBS_LIBDIR:TARGET_OS_mingw32 = "\
> @@ -41,6 +41,8 @@ DEPENDS_${PN}-g++ = "target:${PN}-sysroot-c++-dev"
>  RDEPENDS_${PN}-gdb = "host:libncurses host:libdl"
>  RDEPENDS_${PN}-gdb:HOST_OS_mingw32 = ""
>  
> +RDEPENDS_${PN}-sysroot-ltrace		= "${PN}-sysroot-libelf"
> +
>  DEPENDS_${PN}-sysroot-libnss-dns	= "${PN}-sysroot-libresolv"
>  RDEPENDS_${PN}-sysroot-libnss-dns	= "${PN}-sysroot-libresolv"
>  DEPENDS_${PN}-sysroot-librt-dev		= "${PN}-sysroot-libpthread-dev"
> @@ -464,6 +466,7 @@ LICENSE_${PN}-sysroot-libanl		= "LGPL-2.1+"
>  LICENSE_${PN}-sysroot-libbrokenlocale	= "LGPL-2.1+"
>  LICENSE_${PN}-sysroot-libcrypt		= "LGPL-2.1+"
>  LICENSE_${PN}-sysroot-libdl		= "LGPL-2.1+"
> +LICENSE_${PN}-sysroot-libelf		= "LGPL-2.1+"
>  LICENSE_${PN}-sysroot-libm		= "LGPL-2.1+"
>  LICENSE_${PN}-sysroot-libmemusage	= "LGPL-2.1+"
>  LICENSE_${PN}-sysroot-libnsl		= "LGPL-2.1+"

Looks good, but please let me know if the change to
AUTO_PACKAGE_LIBS_LIBDIR should be included (ie. is it related to libelf
splitting).

/Esben
Kim Bøndergaard Poulsen - Nov. 19, 2013, 12:24 p.m.
Yes - all changes are related to the elf package.

All libelf binaries goes into sysroot/usr/lib on i686 so I guess the AUTO_PACKAGE_LIBS_LIBDIR change is necessary (or alternatively an explicit libelf FILES_ entry has to be made I guess)

/Kim
Esben Haabendal - Nov. 27, 2013, 1:43 p.m.
Merged to master, thanks.

/Esben

Patch

diff --git a/recipes/crosstool-ng/gcc-package.inc b/recipes/crosstool-ng/gcc-package.inc
index 0b38e1f..8d0ccff 100644
--- a/recipes/crosstool-ng/gcc-package.inc
+++ b/recipes/crosstool-ng/gcc-package.inc
@@ -4,17 +4,17 @@  inherit auto-package-libs
 AUTO_PACKAGE_LIBS = "gcc stdc++ supc++ m"
 AUTO_PACKAGE_LIBS:>TARGET_LIBC_glibc = " \
   dl resolv util crypt pthread thread_db bfd rt nsl \
-  anl BrokenLocale memusage pcprofile SegFault \
+  anl BrokenLocale memusage pcprofile SegFault elf \
   nss_files nss_dns nss_compat nss_nis nss_nisplus nss_hesiod inproctrace"
 AUTO_PACKAGE_LIBS:>TARGET_LIBC_uclibc = " \
-  dl resolv util crypt pthread thread_db bfd rt nsl ubacktrace"
+  dl resolv util crypt pthread thread_db bfd rt nsl ubacktrace elf"
 AUTO_PACKAGE_LIBS:>TARGET_LIBC_mingw = " pdcurses"
 AUTO_PACKAGE_LIBS:>USE_toolchain_dmalloc = " \
   dmalloc dmallocxx dmallocth dmallocthcxx"
 AUTO_PACKAGE_LIBS_PKGPREFIX = "sysroot-lib"
 AUTO_PACKAGE_LIBS_LIBDIR = "\
 ${base_prefix}/${TARGET_ARCH}/sysroot${target_base_libdir}:lib::.so,.so.*,-*.so: \
-${base_prefix}/${TARGET_ARCH}/sysroot${target_libdir}:lib:::.so,.a,_nonshared.a,.la \
+${base_prefix}/${TARGET_ARCH}/sysroot${target_libdir}:lib::.so.*:.so,.a,_nonshared.a,.la \
 ${base_prefix}/${TARGET_ARCH}/debug-root${target_libdir}:lib::.so,.so.*,-*.so: \
 "
 AUTO_PACKAGE_LIBS_LIBDIR:TARGET_OS_mingw32 = "\
@@ -41,6 +41,8 @@  DEPENDS_${PN}-g++ = "target:${PN}-sysroot-c++-dev"
 RDEPENDS_${PN}-gdb = "host:libncurses host:libdl"
 RDEPENDS_${PN}-gdb:HOST_OS_mingw32 = ""
 
+RDEPENDS_${PN}-sysroot-ltrace		= "${PN}-sysroot-libelf"
+
 DEPENDS_${PN}-sysroot-libnss-dns	= "${PN}-sysroot-libresolv"
 RDEPENDS_${PN}-sysroot-libnss-dns	= "${PN}-sysroot-libresolv"
 DEPENDS_${PN}-sysroot-librt-dev		= "${PN}-sysroot-libpthread-dev"
@@ -464,6 +466,7 @@  LICENSE_${PN}-sysroot-libanl		= "LGPL-2.1+"
 LICENSE_${PN}-sysroot-libbrokenlocale	= "LGPL-2.1+"
 LICENSE_${PN}-sysroot-libcrypt		= "LGPL-2.1+"
 LICENSE_${PN}-sysroot-libdl		= "LGPL-2.1+"
+LICENSE_${PN}-sysroot-libelf		= "LGPL-2.1+"
 LICENSE_${PN}-sysroot-libm		= "LGPL-2.1+"
 LICENSE_${PN}-sysroot-libmemusage	= "LGPL-2.1+"
 LICENSE_${PN}-sysroot-libnsl		= "LGPL-2.1+"