Misc recipe upgrades & fixes
cover Misc recipe upgrades & fixes
From: Nitin A Kamble <[email protected]>
The following changes since commit 4cd96710785eb05abeff1f281878655118d4a7dd:
bitbake: Update users of getVar/setVar to use the data store functions directly (2011-11-27 10:35:30 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc
Nitin A Kamble (4):
binutils: upgrade from 2.21.1a to 2.22
libtool: Upgrade from 2.4 -> 2.4.2
gmp: also generate the libgmpcxx library & package it properly
distro-tracking: update information for binutils & libtool
.../conf/distro/include/distro_tracking_fields.inc | 10 +-
meta/conf/distro/include/tcmode-default.inc | 2 +-
..._2.21.1a.bb => binutils-cross-canadian_2.22.bb} | 2 +-
...ils-cross_2.21.1a.bb => binutils-cross_2.22.bb} | 0
...osssdk_2.21.1a.bb => binutils-crosssdk_2.22.bb} | 2 +-
.../binutils/binutils/110-arm-eabi-conf.patch | 24 -
.../binutils/binutils-2.19.1-ld-sysroot.patch | 10 +-
.../binutils/binutils/binutils-poison.patch | 84 ++-
.../binutils/binutils/binutils-powerpc-e5500.patch | 52 +-
.../binutils/binutils-uclibc-100-uclibc-conf.patch | 40 +-
...binutils-uclibc-300-001_ld_makefile_patch.patch | 16 +-
...binutils-uclibc-300-006_better_file_error.patch | 9 +-
...ils-uclibc-300-012_check_ldrunpath_length.patch | 12 +-
.../binutils/binutils-uclibc-gas-needs-libm.patch | 11 +-
.../binutils/binutils-x86_64_i386_biarch.patch | 10 +-
.../binutils/binutils/clone-shadow.patch | 18 +-
.../binutils/binutils/libiberty_path_fix.patch | 8 +-
.../binutils/binutils/libtool-2.4-update.patch | 803 ++++++++++----------
.../binutils/binutils/libtool-rpath-fix.patch | 11 +-
.../{binutils_2.21.1a.bb => binutils_2.22.bb} | 7 +-
.../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 +-
meta/recipes-devtools/libtool/libtool-2.4.inc | 13 -
...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +-
...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +-
...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +-
.../avoid_absolute_paths_for_general_utils.patch | 8 +-
.../libtool/libtool/fix-final-rpath.patch | 10 +-
.../libtool/libtool/fix-rpath.patch | 12 +-
.../libtool/libtool/prefix-manpage-fix.patch | 10 +-
meta/recipes-devtools/libtool/libtool/prefix.patch | 42 +-
.../libtool/libtool/rename-with-sysroot.patch | 194 +++---
.../libtool/libtool/resolve-sysroot.patch | 42 -
.../libtool/libtool/trailingslash.patch | 10 +-
.../libtool/libtool/use-sysroot-in-libpath.patch | 8 +-
.../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
meta/recipes-support/gmp/gmp.inc | 6 +
meta/recipes-support/gmp/gmp_5.0.2.bb | 2 +-
37 files changed, 726 insertions(+), 796 deletions(-)
rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.21.1a.bb => binutils-cross-canadian_2.22.bb} (86%)
rename meta/recipes-devtools/binutils/{binutils-cross_2.21.1a.bb => binutils-cross_2.22.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.21.1a.bb => binutils-crosssdk_2.22.bb} (96%)
delete mode 100644 meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch
rename meta/recipes-devtools/binutils/{binutils_2.21.1a.bb => binutils_2.22.bb} (84%)
rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)Signature · 1 line
1.7.6.4
PATCH 1/4 binutils: upgrade from 2.21.1a to 2.22
From: Nitin A Kamble <[email protected]>
And rebase the patches to the newer source code
This patch is upstream hence deleting it from the recipe.
binutils/110-arm-eabi-conf.patch
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
..._2.21.1a.bb => binutils-cross-canadian_2.22.bb} | 2 +-
...ils-cross_2.21.1a.bb => binutils-cross_2.22.bb} | 0
...osssdk_2.21.1a.bb => binutils-crosssdk_2.22.bb} | 2 +-
.../binutils/binutils/110-arm-eabi-conf.patch | 24 -
.../binutils/binutils-2.19.1-ld-sysroot.patch | 10 +-
.../binutils/binutils/binutils-poison.patch | 84 ++-
.../binutils/binutils/binutils-powerpc-e5500.patch | 52 +-
.../binutils/binutils-uclibc-100-uclibc-conf.patch | 40 +-
...binutils-uclibc-300-001_ld_makefile_patch.patch | 16 +-
...binutils-uclibc-300-006_better_file_error.patch | 9 +-
...ils-uclibc-300-012_check_ldrunpath_length.patch | 12 +-
.../binutils/binutils-uclibc-gas-needs-libm.patch | 11 +-
.../binutils/binutils-x86_64_i386_biarch.patch | 10 +-
.../binutils/binutils/clone-shadow.patch | 18 +-
.../binutils/binutils/libiberty_path_fix.patch | 8 +-
.../binutils/binutils/libtool-2.4-update.patch | 803 ++++++++++----------
.../binutils/binutils/libtool-rpath-fix.patch | 11 +-
.../{binutils_2.21.1a.bb => binutils_2.22.bb} | 7 +-
19 files changed, 543 insertions(+), 578 deletions(-)
rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.21.1a.bb => binutils-cross-canadian_2.22.bb} (86%)
rename meta/recipes-devtools/binutils/{binutils-cross_2.21.1a.bb => binutils-cross_2.22.bb} (100%)
rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.21.1a.bb => binutils-crosssdk_2.22.bb} (96%)
delete mode 100644 meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch
rename meta/recipes-devtools/binutils/{binutils_2.21.1a.bb => binutils_2.22.bb} (84%)meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.6%" SDKGCCVERSION ?= "4.6%" -BINUVERSION ?= "2.21.1a" +BINUVERSION ?= "2.22" EGLIBCVERSION ?= "2.13" UCLIBCVERSION ?= "0.9.32" LINUXLIBCVERSION ?= "3.1"
meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb renamed from meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1a.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-canadian.inc -PR = "r2" +PR = "r0"
meta/recipes-devtools/binutils/binutils-cross_2.22.bb renamed from meta/recipes-devtools/binutils/binutils-cross_2.21.1a.bb +0 -0
meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb renamed from meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1a.bb +1 -1
@@ -4,7 +4,7 @@ inherit crosssdk PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" -PR = "r1" +PR = "r0" do_configure_prepend () { sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch deleted +0 -24
@@ -1,24 +0,0 @@ -Upstream-Status: Pending - ---- /tmp/configure.ac 2008-06-22 14:14:59.000000000 +0200 -+++ binutils-2.18.50.0.7/configure.ac 2008-06-22 14:15:30.000000000 +0200 -@@ -561,7 +561,7 @@ - noconfigdirs="$noconfigdirs target-libffi target-qthreads" - libgloss_dir=arm - ;; -- arm*-*-linux-gnueabi) -+ arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi) - noconfigdirs="$noconfigdirs target-qthreads" - noconfigdirs="$noconfigdirs target-libobjc" - case ${with_newlib} in ---- /tmp/configure 2008-06-22 14:17:11.000000000 +0200 -+++ binutils-2.18.50.0.7/configure 2008-06-22 14:17:56.000000000 +0200 -@@ -2307,7 +2307,7 @@ - noconfigdirs="$noconfigdirs target-libffi target-qthreads" - libgloss_dir=arm - ;; -- arm*-*-linux-gnueabi) -+ arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi) - noconfigdirs="$noconfigdirs target-qthreads" - noconfigdirs="$noconfigdirs target-libobjc" - case ${with_newlib} in
meta/recipes-devtools/binutils/binutils/binutils-2.19.1-ld-sysroot.patch +5 -5
@@ -6,13 +6,13 @@ Signed-off-by: Sven Rebhan <[email protected]> Always try to prepend the sysroot prefix to absolute filenames first. -Index: binutils-2.21/ld/ldfile.c +Index: binutils-2.22/ld/ldfile.c =================================================================== ---- binutils-2.21.orig/ld/ldfile.c -+++ binutils-2.21/ld/ldfile.c -@@ -372,18 +372,24 @@ ldfile_open_file_search (const char *arc +--- binutils-2.22.orig/ld/ldfile.c ++++ binutils-2.22/ld/ldfile.c +@@ -351,18 +351,24 @@ ldfile_open_file_search (const char *arc directory first. */ - if (! entry->is_archive) + if (! entry->maybe_archive) { - if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename)) + /* For absolute pathnames, try to always open the file in the
meta/recipes-devtools/binutils/binutils/binutils-poison.patch +46 -38
157 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/binutils-powerpc-e5500.patch +26 -26
101 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/binutils-uclibc-100-uclibc-conf.patch +22 -18
@@ -1,28 +1,32 @@ Upstream-Status: Pending ---- binutils-2.18.orig/configure -+++ binutils-2.18/configure -@@ -2206,7 +2206,7 @@ - am33_2.0-*-linux*) - noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" +Index: binutils-2.22/configure +=================================================================== +--- binutils-2.22.orig/configure ++++ binutils-2.22/configure +@@ -3130,7 +3130,7 @@ case "${target}" in ;; -- sh-*-linux*) -+ sh*-*-linux*) - noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + s390-*-* | s390x-*-*) ;; - sh*-*-pe|mips*-*-pe|*arm-wince-pe) -@@ -2504,7 +2504,7 @@ - romp-*-*) - noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" +- sh-*-* | sh[34]*-*-*) ++ sh*-*-* | sh[34]*-*-*) + ;; + sh64-*-* | sh5*-*-*) + ;; +@@ -3570,7 +3570,7 @@ case "${target}" in + mips*-*-*) + noconfigdirs="$noconfigdirs gprof" ;; - sh-*-* | sh64-*-*) + sh*-*-* | sh64-*-*) - case "${host}" in - i[3456789]86-*-vsta) ;; # don't add gprof back in - i[3456789]86-*-go32*) ;; # don't add gprof back in ---- binutils-2.18.orig/gprof/configure -+++ binutils-2.18/gprof/configure -@@ -4124,6 +4124,11 @@ + case "${target}" in + sh*-*-elf) + ;; +Index: binutils-2.22/gprof/configure +=================================================================== +--- binutils-2.22.orig/gprof/configure ++++ binutils-2.22/gprof/configure +@@ -6103,6 +6103,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;;
meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-001_ld_makefile_patch.patch +10 -6
@@ -27,9 +27,11 @@ exit 0 Upstream-Status: Inappropriate [debian patch] @DPATCH@ ---- binutils-2.16.91.0.1/ld/Makefile.am -+++ binutils-2.16.91.0.1/ld/Makefile.am -@@ -20,7 +20,7 @@ +Index: binutils-2.22/ld/Makefile.am +=================================================================== +--- binutils-2.22.orig/ld/Makefile.am ++++ binutils-2.22/ld/Makefile.am +@@ -37,7 +37,7 @@ endif # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers.
@@ -38,9 +40,11 @@ Upstream-Status: Inappropriate [debian patch] EMUL = @EMUL@ EMULATION_OFILES = @EMULATION_OFILES@ ---- binutils-2.16.91.0.1/ld/Makefile.in -+++ binutils-2.16.91.0.1/ld/Makefile.in -@@ -268,7 +268,7 @@ +Index: binutils-2.22/ld/Makefile.in +=================================================================== +--- binutils-2.22.orig/ld/Makefile.in ++++ binutils-2.22/ld/Makefile.in +@@ -366,7 +366,7 @@ AM_CFLAGS = $(WARN_CFLAGS) # We put the scripts in the directory $(scriptdir)/ldscripts. # We can't put the scripts in $(datadir) because the SEARCH_DIR # directives need to be different for native and cross linkers.
meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-006_better_file_error.patch +5 -4
@@ -25,10 +25,11 @@ exit 0 Upstream-Status: Inappropriate [debian patch] @DPATCH@ -diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c ---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 -+++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 -@@ -150,6 +150,13 @@ +Index: binutils-2.22/bfd/opncls.c +=================================================================== +--- binutils-2.22.orig/bfd/opncls.c ++++ binutils-2.22/bfd/opncls.c +@@ -197,6 +197,13 @@ bfd_fopen (const char *filename, const c { bfd *nbfd; const bfd_target *target_vec;
meta/recipes-devtools/binutils/binutils/binutils-uclibc-300-012_check_ldrunpath_length.patch +6 -6
@@ -25,11 +25,11 @@ exit 0 Upstream-Status: Inappropriate [debian patch] @DPATCH@ -Index: src/ld/emultempl/elf32.em +Index: binutils-2.22/ld/emultempl/elf32.em =================================================================== ---- src.orig/ld/emultempl/elf32.em 2009-09-23 06:54:28.000000000 -0700 -+++ src/ld/emultempl/elf32.em 2009-10-06 10:58:16.883414592 -0700 -@@ -1237,6 +1237,8 @@ fragment <<EOF +--- binutils-2.22.orig/ld/emultempl/elf32.em ++++ binutils-2.22/ld/emultempl/elf32.em +@@ -1273,6 +1273,8 @@ fragment <<EOF && command_line.rpath == NULL) { lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -38,7 +38,7 @@ Index: src/ld/emultempl/elf32.em if (gld${EMULATION_NAME}_search_needed (lib_path, &n, force)) break; -@@ -1463,6 +1465,8 @@ gld${EMULATION_NAME}_before_allocation ( +@@ -1500,6 +1502,8 @@ gld${EMULATION_NAME}_before_allocation ( rpath = command_line.rpath; if (rpath == NULL) rpath = (const char *) getenv ("LD_RUN_PATH");
@@ -46,4 +46,4 @@ Index: src/ld/emultempl/elf32.em + rpath = NULL; for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) - { + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
meta/recipes-devtools/binutils/binutils/binutils-uclibc-gas-needs-libm.patch +5 -6
@@ -19,11 +19,11 @@ floatformat.c:(.text+0x43e): undefined reference to `ldexp' collect2: ld returned 1 exit status make[4]: *** [as-new] Error 1 -Index: binutils-2.17.50/gas/configure.tgt +Index: binutils-2.22/gas/configure.tgt =================================================================== ---- binutils-2.17.50.orig/gas/configure.tgt -+++ binutils-2.17.50/gas/configure.tgt -@@ -408,6 +408,12 @@ case ${generic_target} in +--- binutils-2.22.orig/gas/configure.tgt ++++ binutils-2.22/gas/configure.tgt +@@ -428,6 +428,12 @@ case ${generic_target} in *-*-netware) fmt=elf em=netware ;; esac
@@ -34,6 +34,5 @@ Index: binutils-2.17.50/gas/configure.tgt +esac + case ${cpu_type} in - alpha | arm | i386 | ia64 | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k) + alpha | arm | i386 | ia64 | microblaze | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k) bfd_gas=yes -
meta/recipes-devtools/binutils/binutils/binutils-x86_64_i386_biarch.patch +6 -4
@@ -9,11 +9,13 @@ # Adapted to binutils 2.18.50.0.7 Upstream-Status: Inappropriate [embedded specific] ---- binutils/ld/emulparams/elf_i386.sh -+++ binutils/ld/emulparams/elf_i386.sh -@@ -12,3 +12,13 @@ +Index: binutils-2.22/ld/emulparams/elf_i386.sh +=================================================================== +--- binutils-2.22.orig/ld/emulparams/elf_i386.sh ++++ binutils-2.22/ld/emulparams/elf_i386.sh +@@ -14,3 +14,13 @@ GENERATE_PIE_SCRIPT=yes + NO_SMALL_DATA=yes SEPARATE_GOTPLT=12 - SHARABLE_SECTIONS=yes IREL_IN_PLT= + +# Linux modify the default library search path to first include
meta/recipes-devtools/binutils/binutils/clone-shadow.patch +9 -9
@@ -11,11 +11,11 @@ binutils. Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> -Index: binutils-2.21.1/gas/config/obj-elf.c +Index: binutils-2.22/gas/config/obj-elf.c =================================================================== ---- binutils-2.21.1.orig/gas/config/obj-elf.c 2011-03-23 07:14:03.000000000 -0700 -+++ binutils-2.21.1/gas/config/obj-elf.c 2011-07-16 19:05:57.003831035 -0700 -@@ -741,10 +741,10 @@ +--- binutils-2.22.orig/gas/config/obj-elf.c ++++ binutils-2.22/gas/config/obj-elf.c +@@ -741,10 +741,10 @@ obj_elf_change_section (const char *name } static bfd_vma
@@ -28,7 +28,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c while (len > 0) { -@@ -775,7 +775,7 @@ +@@ -775,7 +775,7 @@ obj_elf_parse_section_letters (char *str attr |= SHF_TLS; break; case '?':
@@ -37,7 +37,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c break; /* Compatibility. */ case 'm': -@@ -978,7 +978,7 @@ +@@ -978,7 +978,7 @@ obj_elf_section (int push) if (*input_line_pointer == '"') {
@@ -46,7 +46,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c beg = demand_copy_C_string (&dummy); if (beg == NULL) -@@ -986,7 +986,7 @@ +@@ -986,7 +986,7 @@ obj_elf_section (int push) ignore_rest_of_line (); return; }
@@ -55,7 +55,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c SKIP_WHITESPACE (); if (*input_line_pointer == ',') -@@ -1038,10 +1038,10 @@ +@@ -1038,10 +1038,10 @@ obj_elf_section (int push) attr &= ~SHF_MERGE; }
@@ -68,7 +68,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c } if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',') { -@@ -1063,7 +1063,7 @@ +@@ -1063,7 +1063,7 @@ obj_elf_section (int push) attr &= ~SHF_GROUP; }
meta/recipes-devtools/binutils/binutils/libiberty_path_fix.patch +4 -4
@@ -6,11 +6,11 @@ Thanks to RP for helping find the source code causing the issue. 2010/08/13 Nitin A Kamble <[email protected]> -Index: binutils-2.20.1/libiberty/Makefile.in +Index: binutils-2.22/libiberty/Makefile.in =================================================================== ---- binutils-2.20.1.orig/libiberty/Makefile.in -+++ binutils-2.20.1/libiberty/Makefile.in -@@ -327,7 +327,8 @@ install: install_to_$(INSTALL_DEST) inst +--- binutils-2.22.orig/libiberty/Makefile.in ++++ binutils-2.22/libiberty/Makefile.in +@@ -350,7 +350,8 @@ install-strip: install # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the # default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags.
meta/recipes-devtools/binutils/binutils/libtool-2.4-update.patch +388 -415
2,450 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch +6 -5
Lines of this file are not shown. View the raw message.
meta/recipes-devtools/binutils/binutils_2.22.bb renamed from meta/recipes-devtools/binutils/binutils_2.21.1a.bb +2 -5
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.6.4
Part of the diff is not shown here. View the raw message.
PATCH 2/4 libtool: Upgrade from 2.4 -> 2.4.2
From: Nitin A Kamble <[email protected]>
Rebased patches to the newer source code and deleted resolve-sysroot.patch since its already applied upstream
merged libtool-2.4.2.inc & libtool.inc files
replaced PR with ${INC_PR}.0
---
.../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 ++-
meta/recipes-devtools/libtool/libtool-2.4.inc | 13 --
...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +-
...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +-
...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +-
.../avoid_absolute_paths_for_general_utils.patch | 8 +-
.../libtool/libtool/fix-final-rpath.patch | 10 +-
.../libtool/libtool/fix-rpath.patch | 12 +-
.../libtool/libtool/prefix-manpage-fix.patch | 10 +-
meta/recipes-devtools/libtool/libtool/prefix.patch | 42 ++--
.../libtool/libtool/rename-with-sysroot.patch | 194 ++++++++++----------
.../libtool/libtool/resolve-sysroot.patch | 42 -----
.../libtool/libtool/trailingslash.patch | 10 +-
.../libtool/libtool/use-sysroot-in-libpath.patch | 8 +-
.../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
15 files changed, 171 insertions(+), 212 deletions(-)
rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +20 -6
@@ -1,4 +1,3 @@ -SUMMARY = "Generic library support script" DESCRIPTION = "This is GNU libtool, a generic library support script. \ Libtool hides the complexity of generating special library types \ (such as shared libraries) behind a consistent interface."
@@ -8,21 +7,36 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" +INC_PR = "r0" + SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://trailingslash.patch \ file://prefix-manpage-fix.patch \ file://rename-with-sysroot.patch \ - file://resolve-sysroot.patch \ file://use-sysroot-in-libpath.patch \ file://fix-final-rpath.patch \ file://avoid_absolute_paths_for_general_utils.patch \ - file://fix-rpath.patch " + file://fix-rpath.patch \ + " + +SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" +SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" do_compile_prepend () { - # Sometimes this file doesn't get rebuilt, force the issue - rm -f ${S}/libltdl/config/ltmain.sh - make libltdl/config/ltmain.sh + # Sometimes this file doesn't get rebuilt, force the issue + rm -f ${S}/libltdl/config/ltmain.sh + make libltdl/config/ltmain.sh } inherit autotools EXTRA_AUTORECONF = "--exclude=libtoolize" + +DEPENDS = "libtool-native" + +PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" +FILES_${PN} += "${datadir}/aclocal*" +FILES_libltdl = "${libdir}/libltdl.so.*" +FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" +FILES_libltdl-dbg = "${libdir}/.debug/" + +EXTRA_OECONF = "--with-sysroot"
meta/recipes-devtools/libtool/libtool-2.4.inc deleted +0 -13
@@ -1,13 +0,0 @@ -require libtool.inc -DEPENDS = "libtool-native" - -PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" -FILES_${PN} += "${datadir}/aclocal*" -FILES_libltdl = "${libdir}/libltdl.so.*" -FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" -FILES_libltdl-dbg = "${libdir}/.debug/" - -SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021" -SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e" - -EXTRA_OECONF = "--with-sysroot"
meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.bb +1 -1
@@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r5" +PR = "${INC_PR}.0" PACKAGES = "" SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch"
meta/recipes-devtools/libtool/libtool-native_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-native_2.4.bb +1 -1
@@ -2,7 +2,7 @@ require libtool-${PV}.inc DEPENDS = "" -PR = "r4" +PR = "${INC_PR}.0" SRC_URI += "file://prefix.patch" inherit native
meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +1 -1
@@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r5" +PR = "${INC_PR}.0" SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch"
meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch +4 -4
@@ -12,11 +12,11 @@ Nitin A Kamble <[email protected]> 2011/02/18 -Index: libtool-2.4/libltdl/config/general.m4sh +Index: libtool-2.4.2/libltdl/config/general.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/general.m4sh 2010-08-31 23:02:45.000000000 -0700 -+++ libtool-2.4/libltdl/config/general.m4sh 2011-02-18 09:59:09.482038240 -0800 -@@ -45,15 +45,15 @@ +--- libtool-2.4.2.orig/libltdl/config/general.m4sh ++++ libtool-2.4.2/libltdl/config/general.m4sh +@@ -45,15 +45,15 @@ progpath="$0" M4SH_VERBATIM([[ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch +5 -5
@@ -7,11 +7,11 @@ This works around the issue until it gets sorted out upstream. Fix suggested by Richard Purdie <[email protected]> Signed-off-by: Scott Garman <[email protected]> -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-01-13 14:10:14.580025108 +0000 -+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-01-13 15:10:18.540025113 +0000 -@@ -7246,9 +7246,11 @@ +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -7268,9 +7268,11 @@ EOF test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then
@@ -25,7 +25,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else -@@ -7981,6 +7983,10 @@ +@@ -7999,6 +8001,10 @@ EOF hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then
meta/recipes-devtools/libtool/libtool/fix-rpath.patch +6 -6
@@ -6,11 +6,11 @@ RP 23/9/2011 Upstream-status: Pending -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-09-23 08:38:06.365043626 +0100 -+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100 -@@ -7264,8 +7264,14 @@ +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -7286,8 +7286,14 @@ EOF esac fi else
@@ -27,7 +27,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8001,8 +8007,14 @@ +@@ -8019,8 +8025,14 @@ EOF esac fi else
@@ -44,7 +44,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8052,8 +8064,14 @@ +@@ -8070,8 +8082,14 @@ EOF esac fi else
meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch +5 -5
@@ -6,12 +6,12 @@ nstead use the build version of libtool to generate the man pages. Date: 2010/07/09 Signed-Off-By: Nitin A Kamble <[email protected]> -Index: libtool-2.2.10/Makefile.am +Index: libtool-2.4.2/Makefile.am =================================================================== ---- libtool-2.2.10.orig/Makefile.am -+++ libtool-2.2.10/Makefile.am -@@ -337,7 +337,7 @@ update_mans = \ - PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ +--- libtool-2.4.2.orig/Makefile.am ++++ libtool-2.4.2/Makefile.am +@@ -333,7 +333,7 @@ update_mans = \ + PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ $(HELP2MAN) --output=$@ $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh - $(update_mans) --help-option=--help-all libtool
meta/recipes-devtools/libtool/libtool/prefix.patch +21 -21
86 lines not on this page · raw message
meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch +97 -97
475 lines not on this page · raw message
meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-devtools/libtool/libtool/trailingslash.patch +5 -5
@@ -11,12 +11,12 @@ Merged a patch received from Gary Thomas <[email protected]> Date: 2010/07/12 Nitin A Kamble <[email protected]> -Index: libtool-2.2.10/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.2.10/libltdl/config/ltmain.m4sh -@@ -1634,8 +1634,15 @@ func_mode_install () - dir="$dir$objdir" +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -2167,8 +2167,15 @@ func_mode_install () + func_append dir "$objdir" if test -n "$relink_command"; then + # Strip any trailing slash from the destination.
meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch +4 -4
@@ -7,11 +7,11 @@ i.e. when lt_sysroot is not set, it will still behave the same and add -Khem Raj <[email protected]> -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4/libltdl/config/ltmain.m4sh -@@ -6122,7 +6122,7 @@ func_mode_link () +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -6138,7 +6138,7 @@ func_mode_link () fi else # We cannot seem to hardcode it, guess we'll fake it.
meta/recipes-devtools/libtool/libtool_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool_2.4.bb +1 -1
@@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r4" +PR = "${INC_PR}.0" # # We want the results of libtool-cross preserved - don't stage anything ourselves.
Signature · 1 line
1.7.6.4
Re: [PATCH 2/4] libtool: Upgrade from 2.4 -> 2.4.2
Quoted 44 lines · On 11/28/2011 04:36 PM, [email protected] wrote:
From: Nitin A Kamble<[email protected]>
Rebased patches to the newer source code and deleted resolve-sysroot.patch since its already applied upstream
merged libtool-2.4.2.inc& libtool.inc files
replaced PR with ${INC_PR}.0
Signed-off-by Nitin A Kamble<[email protected]>Signed-off-by Khem Raj<[email protected]>--- .../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 ++- meta/recipes-devtools/libtool/libtool-2.4.inc | 13 -- ...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +- ...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +- ...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +- .../avoid_absolute_paths_for_general_utils.patch | 8 +- .../libtool/libtool/fix-final-rpath.patch | 10 +- .../libtool/libtool/fix-rpath.patch | 12 +- .../libtool/libtool/prefix-manpage-fix.patch | 10 +- meta/recipes-devtools/libtool/libtool/prefix.patch | 42 ++-- .../libtool/libtool/rename-with-sysroot.patch | 194 ++++++++++---------- .../libtool/libtool/resolve-sysroot.patch | 42 ----- .../libtool/libtool/trailingslash.patch | 10 +- .../libtool/libtool/use-sysroot-in-libpath.patch | 8 +- .../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +- 15 files changed, 171 insertions(+), 212 deletions(-)rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%) delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%) rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%) rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%) delete mode 100644meta/recipes-devtools/libtool/libtool/resolve-sysroot.patchrename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +0
-0
meta/recipes-devtools/libtool/libtool-2.4.2.inc line 1
Quoted 1 line
meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +0
-1@@ -1,4 +1,3 @@ -SUMMARY = "Generic library support script"
Why are you removing the SUMMARY, this was an issue with Khem's original update also, and RP commented on this before.
Quoted 23 lines
meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +7
-2DESCRIPTION = "This is GNU libtool, a generic library support script. \ Libtool hides the complexity of generating special library types \ (such as shared libraries) behind a consistent interface."@@ -8,21 +7,36 @@ LICENSE = "GPLv2& LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" +INC_PR = "r0" + SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://trailingslash.patch \ file://prefix-manpage-fix.patch \ file://rename-with-sysroot.patch \ - file://resolve-sysroot.patch \ file://use-sysroot-in-libpath.patch \ file://fix-final-rpath.patch \ file://avoid_absolute_paths_for_general_utils.patch \ - file://fix-rpath.patch " + file://fix-rpath.patch \ + " + +SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" +SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
meta/recipes-devtools/libtool/libtool-2.4.2.inc LICENSE = "GPLv2& LGPLv2.1" · line 30
Quoted 10 lines
meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +3
-3do_compile_prepend () { - # Sometimes this file doesn't get rebuilt, force the issue - rm -f ${S}/libltdl/config/ltmain.sh - make libltdl/config/ltmain.sh + # Sometimes this file doesn't get rebuilt, force the issue + rm -f ${S}/libltdl/config/ltmain.sh + make libltdl/config/ltmain.sh }
I believe that RP also commented on this white space issue in the past.
Please address these issues.
Thanks
Sau!
Quoted 910 lines
meta/recipes-devtools/libtool/libtool-2.4.2.inc renamed from meta/recipes-devtools/libtool/libtool.inc +10
-0inherit autotools EXTRA_AUTORECONF = "--exclude=libtoolize" + +DEPENDS = "libtool-native" + +PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" +FILES_${PN} += "${datadir}/aclocal*" +FILES_libltdl = "${libdir}/libltdl.so.*" +FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" +FILES_libltdl-dbg = "${libdir}/.debug/" + +EXTRA_OECONF = "--with-sysroot"meta/recipes-devtools/libtool/libtool-2.4.inc deleted +0
-13@@ -1,13 +0,0 @@ -require libtool.inc -DEPENDS = "libtool-native" - -PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" -FILES_${PN} += "${datadir}/aclocal*" -FILES_libltdl = "${libdir}/libltdl.so.*" -FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" -FILES_libltdl-dbg = "${libdir}/.debug/" - -SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021" -SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e" - -EXTRA_OECONF = "--with-sysroot"meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.bb +1
-1@@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r5" +PR = "${INC_PR}.0" PACKAGES = "" SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch"meta/recipes-devtools/libtool/libtool-native_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-native_2.4.bb +1
-1@@ -2,7 +2,7 @@ require libtool-${PV}.inc DEPENDS = "" -PR = "r4" +PR = "${INC_PR}.0" SRC_URI += "file://prefix.patch" inherit nativemeta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +1
-1@@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r5" +PR = "${INC_PR}.0" SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch"meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch +4
-4@@ -12,11 +12,11 @@ Nitin A Kamble<[email protected]> 2011/02/18 -Index: libtool-2.4/libltdl/config/general.m4sh +Index: libtool-2.4.2/libltdl/config/general.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/general.m4sh 2010-08-31 23:02:45.000000000 -0700 -+++ libtool-2.4/libltdl/config/general.m4sh 2011-02-18 09:59:09.482038240 -0800 -@@ -45,15 +45,15 @@ +--- libtool-2.4.2.orig/libltdl/config/general.m4sh ++++ libtool-2.4.2/libltdl/config/general.m4sh +@@ -45,15 +45,15 @@ progpath="$0" M4SH_VERBATIM([[ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch +5
-5@@ -7,11 +7,11 @@ This works around the issue until it gets sorted out upstream. Fix suggested by Richard Purdie<[email protected]> Signed-off-by: Scott Garman<[email protected]> -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-01-13 14:10:14.580025108 +0000 -+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-01-13 15:10:18.540025113 +0000 -@@ -7246,9 +7246,11 @@ +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -7268,9 +7268,11 @@ EOF test "$opt_mode" != relink&& rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then@@ -25,7 +25,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else -@@ -7981,6 +7983,10 @@ +@@ -7999,6 +8001,10 @@ EOF hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; thenmeta/recipes-devtools/libtool/libtool/fix-rpath.patch +6
-6@@ -6,11 +6,11 @@ RP 23/9/2011 Upstream-status: Pending -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-09-23 08:38:06.365043626 +0100 -+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100 -@@ -7264,8 +7264,14 @@ +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -7286,8 +7286,14 @@ EOF esac fi else@@ -27,7 +27,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8001,8 +8007,14 @@ +@@ -8019,8 +8025,14 @@ EOF esac fi else@@ -44,7 +44,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8052,8 +8064,14 @@ +@@ -8070,8 +8082,14 @@ EOF esac fi elsemeta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch +5
-5@@ -6,12 +6,12 @@ nstead use the build version of libtool to generate the man pages. Date: 2010/07/09 Signed-Off-By: Nitin A Kamble<[email protected]> -Index: libtool-2.2.10/Makefile.am +Index: libtool-2.4.2/Makefile.am =================================================================== ---- libtool-2.2.10.orig/Makefile.am -+++ libtool-2.2.10/Makefile.am -@@ -337,7 +337,7 @@ update_mans = \ - PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ +--- libtool-2.4.2.orig/Makefile.am ++++ libtool-2.4.2/Makefile.am +@@ -333,7 +333,7 @@ update_mans = \ + PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ $(HELP2MAN) --output=$@ $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh - $(update_mans) --help-option=--help-all libtoolmeta/recipes-devtools/libtool/libtool/prefix.patch +21
-21@@ -18,10 +18,10 @@ the simplest fix is just to remove $SHELL. Updated: Date: 2011/11/09 RP -Index: libtool-2.4/libltdl/m4/libtool.m4 +Index: libtool-2.4.2/libltdl/m4/libtool.m4 =================================================================== ---- libtool-2.4.orig/libltdl/m4/libtool.m4 -+++ libtool-2.4/libltdl/m4/libtool.m4 +--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 ++++ libtool-2.4.2/libltdl/m4/libtool.m4 @@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) LIBTOOL_DEPS="$ltmain"@@ -32,7 +32,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 AC_SUBST(LIBTOOL)dnl _LT_SETUP -@@ -204,7 +205,7 @@ aix3*) +@@ -206,7 +207,7 @@ aix3*) esac # Global variables:@@ -41,10 +41,10 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -Index: libtool-2.4/Makefile.am +Index: libtool-2.4.2/Makefile.am =================================================================== ---- libtool-2.4.orig/Makefile.am -+++ libtool-2.4/Makefile.am +--- libtool-2.4.2.orig/Makefile.am ++++ libtool-2.4.2/Makefile.am @@ -31,7 +31,7 @@ AM_LDFLAGS = DIST_SUBDIRS = . EXTRA_DIST =@@ -54,8 +54,17 @@ Index: libtool-2.4/Makefile.am CLEANFILES = MOSTLYCLEANFILES = -@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre - ## ---------------- ## +@@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li + ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ + ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ + ChangeLog.2008 ChangeLog.2009 ChangeLog.2010 +-CLEANFILES += libtool libtoolize libtoolize.tmp \ ++CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ + $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp + + ## These are the replacements that need to be made at bootstrap time, +@@ -231,7 +231,7 @@ configure_edit = sed \ + -e 's,@SED\@,$(SED),g' # The libtool distributor and the standalone libtool script. -bin_SCRIPTS = libtoolize libtool@@ -63,7 +72,7 @@ Index: libtool-2.4/Makefile.am libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status rm -f libtoolize.tmp libtoolize -@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib +@@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to # We used to do this with a 'stamp-vcl' file, but non-gmake builds # would rerun configure on every invocation, so now we manually # check the version numbers from the build rule when necessary.@@ -74,7 +83,7 @@ Index: libtool-2.4/Makefile.am if test -f "$$target"; then \ set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ test "$$actualver" = "$$correctver"&& rebuild=false; \ -@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $ +@@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $ case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ done; \ if $$rebuild; then \@@ -85,16 +94,7 @@ Index: libtool-2.4/Makefile.am fi .PHONY: configure-subdirs -@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li - ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ - ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ - ChangeLog.2008 ChangeLog.2009 --CLEANFILES += libtool libtoolize libtoolize.tmp \ -+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ - $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp - - ## We build ltversion.m4 here, instead of from config.status, -@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ +@@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch +97
-97@@ -10,21 +10,21 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html -Khem Raj<[email protected]> -Index: libtool-2.4/configure +Index: libtool-2.4.2/configure =================================================================== ---- libtool-2.4.orig/configure -+++ libtool-2.4/configure -@@ -786,7 +786,7 @@ enable_static +--- libtool-2.4.2.orig/configure ++++ libtool-2.4.2/configure +@@ -795,7 +795,7 @@ enable_static with_pic enable_fast_install with_gnu_ld -with_sysroot +with_libtool_sysroot enable_libtool_lock - with_gnu_ld ' + ac_precious_vars='build_alias @@ -1451,7 +1451,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -32,7 +32,7 @@ Index: libtool-2.4/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6798,29 +6798,29 @@ fi +@@ -6804,29 +6804,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -70,11 +70,11 @@ Index: libtool-2.4/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/libltdl/configure +Index: libtool-2.4.2/libltdl/configure =================================================================== ---- libtool-2.4.orig/libltdl/configure -+++ libtool-2.4/libltdl/configure -@@ -739,7 +739,7 @@ with_pic +--- libtool-2.4.2.orig/libltdl/configure ++++ libtool-2.4.2/libltdl/configure +@@ -747,7 +747,7 @@ with_pic enable_fast_install enable_dependency_tracking with_gnu_ld@@ -83,8 +83,8 @@ Index: libtool-2.4/libltdl/configure enable_libtool_lock enable_ltdl_install ' -@@ -1388,7 +1388,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1395,7 +1395,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -92,7 +92,7 @@ Index: libtool-2.4/libltdl/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6004,29 +6004,29 @@ fi +@@ -6017,29 +6017,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -130,11 +130,11 @@ Index: libtool-2.4/libltdl/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/libltdl/m4/libtool.m4 +Index: libtool-2.4.2/libltdl/m4/libtool.m4 =================================================================== ---- libtool-2.4.orig/libltdl/m4/libtool.m4 -+++ libtool-2.4/libltdl/m4/libtool.m4 -@@ -1180,27 +1180,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr +--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 ++++ libtool-2.4.2/libltdl/m4/libtool.m4 +@@ -1224,27 +1224,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot])@@ -168,11 +168,11 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac -Index: libtool-2.4/tests/cdemo/configure +Index: libtool-2.4.2/tests/cdemo/configure =================================================================== ---- libtool-2.4.orig/tests/cdemo/configure -+++ libtool-2.4/tests/cdemo/configure -@@ -726,7 +726,7 @@ enable_static +--- libtool-2.4.2.orig/tests/cdemo/configure ++++ libtool-2.4.2/tests/cdemo/configure +@@ -734,7 +734,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -181,8 +181,8 @@ Index: libtool-2.4/tests/cdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1373,7 +1373,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1380,7 +1380,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -190,7 +190,7 @@ Index: libtool-2.4/tests/cdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5884,29 +5884,29 @@ fi +@@ -5897,29 +5897,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -228,11 +228,11 @@ Index: libtool-2.4/tests/cdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/demo/configure +Index: libtool-2.4.2/tests/demo/configure =================================================================== ---- libtool-2.4.orig/tests/demo/configure -+++ libtool-2.4/tests/demo/configure -@@ -730,7 +730,7 @@ enable_static +--- libtool-2.4.2.orig/tests/demo/configure ++++ libtool-2.4.2/tests/demo/configure +@@ -738,7 +738,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -241,8 +241,8 @@ Index: libtool-2.4/tests/demo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1377,7 +1377,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1384,7 +1384,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -250,7 +250,7 @@ Index: libtool-2.4/tests/demo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5882,29 +5882,29 @@ fi +@@ -5895,29 +5895,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -288,11 +288,11 @@ Index: libtool-2.4/tests/demo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/depdemo/configure +Index: libtool-2.4.2/tests/depdemo/configure =================================================================== ---- libtool-2.4.orig/tests/depdemo/configure -+++ libtool-2.4/tests/depdemo/configure -@@ -728,7 +728,7 @@ enable_static +--- libtool-2.4.2.orig/tests/depdemo/configure ++++ libtool-2.4.2/tests/depdemo/configure +@@ -736,7 +736,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -301,8 +301,8 @@ Index: libtool-2.4/tests/depdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1375,7 +1375,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1382,7 +1382,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -310,7 +310,7 @@ Index: libtool-2.4/tests/depdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5879,29 +5879,29 @@ fi +@@ -5892,29 +5892,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -348,11 +348,11 @@ Index: libtool-2.4/tests/depdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/f77demo/configure +Index: libtool-2.4.2/tests/f77demo/configure =================================================================== ---- libtool-2.4.orig/tests/f77demo/configure -+++ libtool-2.4/tests/f77demo/configure -@@ -730,7 +730,7 @@ enable_static +--- libtool-2.4.2.orig/tests/f77demo/configure ++++ libtool-2.4.2/tests/f77demo/configure +@@ -738,7 +738,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -361,8 +361,8 @@ Index: libtool-2.4/tests/f77demo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1382,7 +1382,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1387,7 +1387,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -370,7 +370,7 @@ Index: libtool-2.4/tests/f77demo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6864,29 +6864,29 @@ fi +@@ -6877,29 +6877,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -408,11 +408,11 @@ Index: libtool-2.4/tests/f77demo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/fcdemo/configure +Index: libtool-2.4.2/tests/fcdemo/configure =================================================================== ---- libtool-2.4.orig/tests/fcdemo/configure -+++ libtool-2.4/tests/fcdemo/configure -@@ -731,7 +731,7 @@ enable_static +--- libtool-2.4.2.orig/tests/fcdemo/configure ++++ libtool-2.4.2/tests/fcdemo/configure +@@ -739,7 +739,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -421,8 +421,8 @@ Index: libtool-2.4/tests/fcdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1383,7 +1383,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1388,7 +1388,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -430,7 +430,7 @@ Index: libtool-2.4/tests/fcdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6963,29 +6963,29 @@ fi +@@ -6976,29 +6976,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -468,11 +468,11 @@ Index: libtool-2.4/tests/fcdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/mdemo/configure +Index: libtool-2.4.2/tests/mdemo/configure =================================================================== ---- libtool-2.4.orig/tests/mdemo/configure -+++ libtool-2.4/tests/mdemo/configure -@@ -734,7 +734,7 @@ enable_static +--- libtool-2.4.2.orig/tests/mdemo/configure ++++ libtool-2.4.2/tests/mdemo/configure +@@ -742,7 +742,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -481,8 +481,8 @@ Index: libtool-2.4/tests/mdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1381,7 +1381,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1388,7 +1388,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -490,7 +490,7 @@ Index: libtool-2.4/tests/mdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5911,29 +5911,29 @@ fi +@@ -5924,29 +5924,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -528,11 +528,11 @@ Index: libtool-2.4/tests/mdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/mdemo2/configure +Index: libtool-2.4.2/tests/mdemo2/configure =================================================================== ---- libtool-2.4.orig/tests/mdemo2/configure -+++ libtool-2.4/tests/mdemo2/configure -@@ -726,7 +726,7 @@ enable_static +--- libtool-2.4.2.orig/tests/mdemo2/configure ++++ libtool-2.4.2/tests/mdemo2/configure +@@ -734,7 +734,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -541,8 +541,8 @@ Index: libtool-2.4/tests/mdemo2/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1373,7 +1373,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1380,7 +1380,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -550,7 +550,7 @@ Index: libtool-2.4/tests/mdemo2/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5884,29 +5884,29 @@ fi +@@ -5897,29 +5897,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -588,11 +588,11 @@ Index: libtool-2.4/tests/mdemo2/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/pdemo/configure +Index: libtool-2.4.2/tests/pdemo/configure =================================================================== ---- libtool-2.4.orig/tests/pdemo/configure -+++ libtool-2.4/tests/pdemo/configure -@@ -729,7 +729,7 @@ enable_static +--- libtool-2.4.2.orig/tests/pdemo/configure ++++ libtool-2.4.2/tests/pdemo/configure +@@ -737,7 +737,7 @@ enable_static with_pic enable_fast_install with_gnu_ld@@ -601,8 +601,8 @@ Index: libtool-2.4/tests/pdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1376,7 +1376,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1383,7 +1383,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -610,7 +610,7 @@ Index: libtool-2.4/tests/pdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5887,29 +5887,29 @@ fi +@@ -5900,29 +5900,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -648,10 +648,10 @@ Index: libtool-2.4/tests/pdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/sysroot.at +Index: libtool-2.4.2/tests/sysroot.at =================================================================== ---- libtool-2.4.orig/tests/sysroot.at -+++ libtool-2.4/tests/sysroot.at +--- libtool-2.4.2.orig/tests/sysroot.at ++++ libtool-2.4.2/tests/sysroot.at @@ -64,7 +64,7 @@ while read file; do done])@@ -679,21 +679,21 @@ Index: libtool-2.4/tests/sysroot.at AC_SUBST([sysroot]) AC_OUTPUT(Makefile) ]]) -Index: libtool-2.4/tests/tagdemo/configure +Index: libtool-2.4.2/tests/tagdemo/configure =================================================================== ---- libtool-2.4.orig/tests/tagdemo/configure -+++ libtool-2.4/tests/tagdemo/configure -@@ -736,7 +736,7 @@ enable_static +--- libtool-2.4.2.orig/tests/tagdemo/configure ++++ libtool-2.4.2/tests/tagdemo/configure +@@ -744,7 +744,7 @@ enable_static with_pic enable_fast_install with_gnu_ld -with_sysroot +with_libtool_sysroot enable_libtool_lock - with_gnu_ld ' -@@ -1392,7 +1392,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use + ac_precious_vars='build_alias +@@ -1395,7 +1395,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR@@ -701,7 +701,7 @@ Index: libtool-2.4/tests/tagdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6907,29 +6907,29 @@ fi +@@ -6916,29 +6916,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot">&5 $as_echo_n "checking for sysroot... ">&6; }@@ -739,11 +739,11 @@ Index: libtool-2.4/tests/tagdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/testsuite +Index: libtool-2.4.2/tests/testsuite =================================================================== ---- libtool-2.4.orig/tests/testsuite -+++ libtool-2.4/tests/testsuite -@@ -25277,7 +25277,7 @@ $at_traceon; } +--- libtool-2.4.2.orig/tests/testsuite ++++ libtool-2.4.2/tests/testsuite +@@ -26676,7 +26676,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"@@ -752,7 +752,7 @@ Index: libtool-2.4/tests/testsuite #??? if test "$shlibpath_var" = PATH; then -@@ -25475,7 +25475,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -26874,7 +26874,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT@@ -761,7 +761,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -25652,7 +25652,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -27051,7 +27051,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT@@ -770,7 +770,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -25993,7 +25993,7 @@ $at_traceon; } +@@ -27392,7 +27392,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"@@ -779,7 +779,7 @@ Index: libtool-2.4/tests/testsuite #??? if test "$shlibpath_var" = PATH; then -@@ -26191,7 +26191,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -27590,7 +27590,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT@@ -788,7 +788,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -26368,7 +26368,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -27767,7 +27767,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT@@ -797,7 +797,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -26709,7 +26709,7 @@ $at_traceon; } +@@ -28108,7 +28108,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"@@ -806,7 +806,7 @@ Index: libtool-2.4/tests/testsuite #??? if test "$shlibpath_var" = PATH; then -@@ -26907,7 +26907,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -28306,7 +28306,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT@@ -815,7 +815,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -27084,7 +27084,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -28483,7 +28483,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INITmeta/recipes-devtools/libtool/libtool/resolve-sysroot.patch deleted +0
-42@@ -1,42 +0,0 @@ -Upstream-Status: Pending - -Sometimes .las have =/a/b/c.la in dependency_libs. This should be -resolved to sysroot. - --Khem Raj<[email protected]> - -Index: libtool-2.4/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4/libltdl/config/ltmain.m4sh -@@ -8479,7 +8479,8 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir"&& \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -@@ -8505,7 +8506,9 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir"&& \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" -@@ -8524,7 +8527,8 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir"&& \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"meta/recipes-devtools/libtool/libtool/trailingslash.patch +5
-5@@ -11,12 +11,12 @@ Merged a patch received from Gary Thomas<[email protected]> Date: 2010/07/12 Nitin A Kamble<[email protected]> -Index: libtool-2.2.10/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.2.10/libltdl/config/ltmain.m4sh -@@ -1634,8 +1634,15 @@ func_mode_install () - dir="$dir$objdir" +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -2167,8 +2167,15 @@ func_mode_install () + func_append dir "$objdir" if test -n "$relink_command"; then + # Strip any trailing slash from the destination.meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch +4
-4@@ -7,11 +7,11 @@ i.e. when lt_sysroot is not set, it will still behave the same and add -Khem Raj<[email protected]> -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4/libltdl/config/ltmain.m4sh -@@ -6122,7 +6122,7 @@ func_mode_link () +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -6138,7 +6138,7 @@ func_mode_link () fi else # We cannot seem to hardcode it, guess we'll fake it.meta/recipes-devtools/libtool/libtool_2.4.2.bb renamed from meta/recipes-devtools/libtool/libtool_2.4.bb +1
-1@@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r4" +PR = "${INC_PR}.0" # # We want the results of libtool-cross preserved - don't stage anything ourselves.
PATCH 3/4 gmp: also generate the libgmpcxx library & package it properly
In reply to [email protected]From: Nitin A Kamble <[email protected]>
configure runs few checks to make sure c++ compiler and runtime are working as expected with the --enable-cxx=detect option. And it enables building of libgmpxx library.
Same as earlier the libgmp.so.10.x file is packaged in the libgmp10 package, and a new package named libgmpxx4 is added for libgmpxx.so.4.x file.
--- meta/recipes-support/gmp/gmp.inc | 6 ++++++ meta/recipes-support/gmp/gmp_5.0.2.bb | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)
meta/recipes-support/gmp/gmp.inc +6 -0
@@ -14,3 +14,9 @@ ARM_INSTRUCTION_SET = "arm" acpaths = "" BBCLASSEXTEND = "native nativesdk" + +EXTRA_OECONF += " --enable-cxx=detect" + +PACKAGES =+ "libgmp10 libgmpxx4" +FILES_libgmp10 = "${libdir}/libgmp.so.10*" +FILES_libgmpxx4 = "${libdir}/libgmpxx.so.4*"
meta/recipes-support/gmp/gmp_5.0.2.bb +1 -1
@@ -2,7 +2,7 @@ require gmp.inc LICENSE="LGPLv3&GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" -PR = "r1" +PR = "r2" SRC_URI_append += "file://sh4-asmfix.patch \ file://use-includedir.patch "
Signature · 1 line
1.7.6.4
Re: [PATCH 3/4] gmp: also generate the libgmpcxx library & package it properly
Quoted 1 line · On Mon, Nov 28, 2011 at 22:36, <[email protected]> wrote:
...
+PACKAGES =+ "libgmp10 libgmpxx4"
meta/recipes-support/gmp/gmp.inc ARM_INSTRUCTION_SET = "arm" · line 22
Quoted 3 lines
meta/recipes-support/gmp/gmp.inc +2
-0+FILES_libgmp10 = "${libdir}/libgmp.so.10*" +FILES_libgmpxx4 = "${libdir}/libgmpxx.so.4*"
Why didn't you let the system to name the package using the soname by itself and avoid putting the soname on the glob matching?
Signature · 3 lines
Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [PATCH 3/4] gmp: also generate the libgmpcxx library & package it properly
From: [email protected] [mailto:[email protected]] On Behalf Of Otavio Salvador
Sent: Monday, November 28, 2011 5:07 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 3/4] gmp: also generate the libgmpcxx library & package it properly
On Mon, Nov 28, 2011 at 22:36, <[email protected]<mailto:[email protected]>> wrote:
...
+PACKAGES =+ "libgmp10 libgmpxx4"
+FILES_libgmp10 = "${libdir}/libgmp.so.10*"
+FILES_libgmpxx4 = "${libdir}/libgmpxx.so.4*"
Why didn't you let the system to name the package using the soname by itself and avoid putting the soname on the glob matching?
Before the generation of libgmpxx library, there was only one library, libgmp, and it was getting packaged into libgmp10 package. After addition of the libgmpxx library the package name changed to the recipe name (gmp), in order to preserve the previous package name(for distro upgrades), and to let people avoid installation of libgmpxx if they don't need it in order to save the space on target, two packages are generated for each library with this scheme.
Nitin
--
Otavio Salvador O.S. Systems
E-mail: [email protected]<mailto:[email protected]> http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Re: [PATCH 3/4] gmp: also generate the libgmpcxx library & package it properly
Quoted 7 lines · Nitin A
Before the generation of libgmpxx library, there was only one library, libgmp, and it was getting packaged into libgmp10 package. After addition of the libgmpxx library the package name changed to the recipe name (gmp), in order to preserve the previous package name(for distro upgrades), and to let people avoid installation of libgmpxx if they don’t need it in order to save the space on target, two packages are generated for each library with this scheme.
Right, but that's not really the point. I think what Otavio was trying to ask was, why didn't you just do:
PACKAGES =+ "libgmpxx"FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
? I think the way you have done it will cause the libgmp package name to change for people not using debian.bbclass, which is probably a bad thing.
p.
Re: [PATCH 3/4] gmp: also generate the libgmpcxx library & package it properly
Quoted 25 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Phil Blundell
Sent: Tuesday, November 29, 2011 12:00 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 3/4] gmp: also generate the libgmpcxx library & package it properlyQuoted 1 line · Nitin A
Before the generation of libgmpxx library, there was only one
library,
Quoted 6 lines
libgmp, and it was getting packaged into libgmp10 package. After addition of the libgmpxx library the package name changed to the recipe name (gmp), in order to preserve the previous package name(for distro upgrades), and to let people avoid installation of libgmpxx if they don’t need it in order to save the space on target, two packages are generated for each library with this scheme.
Right, but that's not really the point. I think what Otavio was trying to ask was, why didn't you just do:
Quoted 8 lines
PACKAGES =+ "libgmpxx"
FILES_libgmpxx= "${libdir}/libgmpxx${SOLIBS}"? I think the way you have done it will cause the libgmp package name to change for people not using debian.bbclass, which is probably a bad thing.
p.
Thanks Phil,
This was also works the same. And producing same rpm packages as previous one. So I am happy to accept this change if it helps the deb packages. Will resend the commit.
Nitin
Quoted 8 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
PATCH 4/4 distro-tracking: update information for binutils & libtool
In reply to [email protected]From: Nitin A Kamble <[email protected]>
--- .../conf/distro/include/distro_tracking_fields.inc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +5 -5
@@ -2943,9 +2943,9 @@ RECIPE_LAST_UPDATE_pn-sysprof = "Dec 8, 2010" RECIPE_MAINTAINER_pn-sysprof = "Tom Zanussi <[email protected]>" RECIPE_STATUS_pn-binutils="green" -RECIPE_LATEST_VERSION_pn-binutils="2.21.1a" -RECIPE_LAST_UPDATE_pn-binutils = "Aug 29, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-binutils = "Aug 29, 2011" +RECIPE_LATEST_VERSION_pn-binutils="2.22" +RECIPE_LAST_UPDATE_pn-binutils = "Nov 23, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-binutils = "Nov 23, 2011" RECIPE_MAINTAINER_pn-binutils = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-ldconfig-native = "red"
@@ -3014,8 +3014,8 @@ RECIPE_MAINTAINER_pn-intltool = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-libtool="green" RECIPE_LATEST_VERSION_pn-libtool="2.4.2" -RECIPE_LAST_UPDATE_pn-libtool = "Nov 16, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-libtool = "Nov 16, 2011" +RECIPE_LAST_UPDATE_pn-libtool = "Nov 28, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-libtool = "Nov 28, 2011" RECIPE_MAINTAINER_pn-libtool = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-linux-libc-headers="green"
Signature · 1 line
1.7.6.4
Re: [PATCH 1/4] binutils: upgrade from 2.21.1a to 2.22
In reply to [email protected]Quoted 8 lines · On Tue, Nov 29, 2011 at 1:36 AM, <[email protected]> wrote:
From: Nitin A Kamble <[email protected]>
And rebase the patches to the newer source code
This patch is upstream hence deleting it from the recipe.
binutils/110-arm-eabi-conf.patchSigned-off-by Nitin A Kamble <[email protected]>
Could you please update FILES+${PN}-debug to fix this QA?
Thanks
WARNING: For recipe binutils, the following files/directories were installed but not shipped in any package:
WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/strip WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/objcopy WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/objdump WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ld WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/nm WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/as WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ranlib WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ld.bfd WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ar
Cheers,
Re: [PATCH 1/4] binutils: upgrade from 2.21.1a to 2.22
In reply to [email protected]Quoted 40 lines · On (28/11/11 16:36), [email protected] wrote:
From: Nitin A Kamble <[email protected]>
And rebase the patches to the newer source code
This patch is upstream hence deleting it from the recipe.
binutils/110-arm-eabi-conf.patchSigned-off-by Nitin A Kamble <[email protected]>--- meta/conf/distro/include/tcmode-default.inc | 2 +- ..._2.21.1a.bb => binutils-cross-canadian_2.22.bb} | 2 +- ...ils-cross_2.21.1a.bb => binutils-cross_2.22.bb} | 0 ...osssdk_2.21.1a.bb => binutils-crosssdk_2.22.bb} | 2 +- .../binutils/binutils/110-arm-eabi-conf.patch | 24 - .../binutils/binutils-2.19.1-ld-sysroot.patch | 10 +- .../binutils/binutils/binutils-poison.patch | 84 ++- .../binutils/binutils/binutils-powerpc-e5500.patch | 52 +- .../binutils/binutils-uclibc-100-uclibc-conf.patch | 40 +- ...binutils-uclibc-300-001_ld_makefile_patch.patch | 16 +- ...binutils-uclibc-300-006_better_file_error.patch | 9 +- ...ils-uclibc-300-012_check_ldrunpath_length.patch | 12 +- .../binutils/binutils-uclibc-gas-needs-libm.patch | 11 +- .../binutils/binutils-x86_64_i386_biarch.patch | 10 +- .../binutils/binutils/clone-shadow.patch | 18 +- .../binutils/binutils/libiberty_path_fix.patch | 8 +- .../binutils/binutils/libtool-2.4-update.patch | 803 ++++++++++---------- .../binutils/binutils/libtool-rpath-fix.patch | 11 +- .../{binutils_2.21.1a.bb => binutils_2.22.bb} | 7 +- 19 files changed, 543 insertions(+), 578 deletions(-) rename meta/recipes-devtools/binutils/{binutils-cross-canadian_2.21.1a.bb => binutils-cross-canadian_2.22.bb} (86%) rename meta/recipes-devtools/binutils/{binutils-cross_2.21.1a.bb => binutils-cross_2.22.bb} (100%) rename meta/recipes-devtools/binutils/{binutils-crosssdk_2.21.1a.bb => binutils-crosssdk_2.22.bb} (96%) delete mode 100644 meta/recipes-devtools/binutils/binutils/110-arm-eabi-conf.patch rename meta/recipes-devtools/binutils/{binutils_2.21.1a.bb => binutils_2.22.bb} (84%)meta/conf/distro/include/tcmode-default.inc +0
-0
meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/gettext ??= "gettext" · line 24
Quoted 8 lines
meta/conf/distro/include/tcmode-default.inc +1
-1@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.6%" SDKGCCVERSION ?= "4.6%" -BINUVERSION ?= "2.21.1a" +BINUVERSION ?= "2.22" EGLIBCVERSION ?= "2.13" UCLIBCVERSION ?= "0.9.32" LINUXLIBCVERSION ?= "3.1"
What changes does 2.22 bring in, it would be nice to have a little summary e.g.
http://cygwin.com/ml/binutils/2011-08/msg00129.html
changes default behaviour of linker which needs some mention in such upgrades since it will bite many packages which dont have proper dependencies specified.
And I think it would be better to leave the older release recipes in for a while for at least toolchain components while the new versions gets soaked in. Given now we have layers its better that way to give some time for other layers also to test the new version
Thanks
-Khem