libtool enhancement v2
Hello,
Here is a second version of a patch set mostly from Martin Banky to support libtool patching depending on the libtool script version. This also bumps libtool to version 2.2.10, so we can autoreconfigure packages depending on libtool 2.2 versions (gtk+, glib, etc...).
You can pull from :
git://git.potipota.net/buildroot martins-libtool
Regards,
--
Lionel Landwerlin
PATCH 1/7 BugFix - buildroot-libtool.patch - Removed Useless Code
From: Martin Banky <[email protected]>
The code that was removed only added commented out code. It neither added needed code nor commented out existing code.
--- package/buildroot-libtool.patch | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-)
package/buildroot-libtool.patch +0 -17
@@ -38,23 +38,6 @@ fi # This is a shared library -@@ -2889,6 +2896,16 @@ EOF - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" -+# This interferes with crosscompilation. -CL -+# else -+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+# if test -z "$libdir"; then -+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+# exit 1 -+# fi -+# if test "$absdir" != "$libdir"; then -+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+# fi - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then @@ -5606,6 +5623,10 @@ fi\ # Replace all uninstalled libtool libraries with the installed ones newdependency_libs=
Signature · 1 line
1.7.1
PATCH 2/7 Added the ability to patch ltmain.sh based on version
In reply to llandwerlin at gmail.comFrom: Martin Banky <[email protected]>
There are two versions of ltmain.sh in use in the buildroot system, 1.5.x and 2.2.x. buildroot-libtool.patch would only patch 1.5.x, which meant that for 2.2.x, a separate patch for the affected package had to be maintained. Modified Makefile.autotools.in to check the version of ltmain.sh and apply the correct patch.
--- package/Makefile.autotools.in | 23 ++++++++--- package/buildroot-libtool-v1.5.patch | 69 ++++++++++++++++++++++++++++++++++ package/buildroot-libtool-v2.2.patch | 64 +++++++++++++++++++++++++++++++ package/buildroot-libtool.patch | 69 ---------------------------------- 4 files changed, 150 insertions(+), 75 deletions(-) create mode 100644 package/buildroot-libtool-v1.5.patch create mode 100644 package/buildroot-libtool-v2.2.patch delete mode 100644 package/buildroot-libtool.patch
package/Makefile.autotools.in +17 -6
@@ -139,10 +139,16 @@ $(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK # define LIBTOOL_PATCH_HOOK @$(call MESSAGE,"Patching libtool") - $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \ - "$$($$(PKG)_AUTORECONF)" != "YES"; then \ - for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ - toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool.patch; \ + $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" \ + -a "$$($$(PKG)_AUTORECONF)" != "YES"; then \ + for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $$$${ltmain_version} = '1.5'; then \ + toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \ + elif test $$$${ltmain_version} = "2.2"; then\ + toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \ + fi \ done \ fi endef
@@ -158,9 +164,14 @@ endif define AUTORECONF_HOOK @$(call MESSAGE,"Autoreconfiguring") $(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT) - $(Q)if test "$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ + $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ - toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \ + if test $$$${ltmain_version} = "1.5"; then \ + toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \ + elif test $$$${ltmain_version} = "2.2"; then\ + toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \ + fi \ done \ fi endef
package/buildroot-libtool-v1.5.patch new file +69 -0
69 lines not on this page · raw message
package/buildroot-libtool-v2.2.patch new file +64 -0
64 lines not on this page · raw message
package/buildroot-libtool.patch deleted +0 -69
69 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 3/7 Removed expat-libdir-la.patch
In reply to llandwerlin at gmail.comFrom: Martin Banky <[email protected]>
Now that expat.mk has been converted to autotools infrastructure, the patch is no longer needed. Autotools will automatically apply the needed patch.
--- package/expat/expat-libdir-la.patch | 77 ----------------------------------- package/expat/expat.mk | 1 - 2 files changed, 0 insertions(+), 78 deletions(-) delete mode 100644 package/expat/expat-libdir-la.patch
package/expat/expat-libdir-la.patch deleted +0 -77
@@ -1,77 +0,0 @@ ---- expat-2.0.0/conftools/ltmain.sh.orig 2007-01-13 14:39:51.000000000 -0700 -+++ expat-2.0.0/conftools/ltmain.sh 2007-01-13 14:39:56.000000000 -0700 -@@ -273,8 +273,9 @@ - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" -- $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit $EXIT_FAILURE -+ $echo "$modename: defaulting to \`CC'" -+ $echo "$modename: if this is not correct, specify a tag with \`--tag'" -+# exit $EXIT_FAILURE - # else - # $echo "$modename: using $tagname tagged configuration" - fi -@@ -2404,8 +2405,14 @@ - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ # Adding 'libdir' from the .la file to our library search paths -+ # breaks crosscompilation horribly. We cheat here and don't add -+ # it, instead adding the path where we found the .la. -CL -+ dir="$abs_ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ #dir="$libdir" -+ #absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -2886,6 +2893,16 @@ - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" -+# This interferes with crosscompilation. -CL -+# else -+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+# if test -z "$libdir"; then -+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+# exit 1 -+# fi -+# if test "$absdir" != "$libdir"; then -+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+# fi - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then -@@ -5598,6 +5615,10 @@ - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do -+ # Replacing uninstalled with installed can easily break crosscompilation, -+ # since the installed path is generally the wrong architecture. -CL -+ newdependency_libs="$newdependency_libs $deplib" -+ continue - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -@@ -5919,10 +5940,13 @@ - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- if test "$inst_prefix_dir" = "$destdir"; then -- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -- exit $EXIT_FAILURE -- fi -+ # -+ # This breaks install into our staging area. -PB -+ # -+ # if test "$inst_prefix_dir" = "$destdir"; then -+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ # exit $EXIT_FAILURE -+ # fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command.
package/expat/expat.mk +0 -1
@@ -7,7 +7,6 @@ EXPAT_VERSION = 2.0.1 EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat -EXPAT_LIBTOOL_PATCH = NO EXPAT_INSTALL_STAGING = YES EXPAT_INSTALL_TARGET = YES EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
Signature · 1 line
1.7.1
PATCH 4/7 Removed freetype-2.3.9-libdir-la.patch
In reply to llandwerlin at gmail.comFrom: Martin Banky <[email protected]>
Now that freetype.mk has been converted to autotools infrastructure, the patch is no longer needed. Autotools will automatically apply the needed patch.
--- package/freetype/freetype-2.3.9-libdir-la.patch | 81 ----------------------- package/freetype/freetype.mk | 1 - 2 files changed, 0 insertions(+), 82 deletions(-) delete mode 100644 package/freetype/freetype-2.3.9-libdir-la.patch
package/freetype/freetype-2.3.9-libdir-la.patch deleted +0 -81
@@ -1,81 +0,0 @@ -diff -urN freetype-2.3.7.orig/builds/unix/ltmain.sh freetype-2.3.7/builds/unix/ltmain.sh ---- freetype-2.3.7.orig/builds/unix/ltmain.sh 2008-09-16 15:55:36.000000000 +0100 -+++ freetype-2.3.7/builds/unix/ltmain.sh 2008-09-22 09:18:36.000000000 +0100 -@@ -1047,8 +1047,9 @@ - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then -- func_echo "unable to infer tagged configuration" -- func_fatal_error "specify a tag with \`--tag'" -+ func_echo "unable to infer tagged configuration" -+ func_echo "$modename: defaulting to \`CC'" -+ func_echo "$modename: if this is not correct, specify a tag with \`--tag'" - # else - # func_verbose "using $tagname tagged configuration" - fi -@@ -2017,8 +2018,11 @@ - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- test "$inst_prefix_dir" = "$destdir" && \ -- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" -+ # -+ # This breaks install into our staging area. -PB -+ # -+ #test "$inst_prefix_dir" = "$destdir" && \ -+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -@@ -4885,8 +4889,14 @@ - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ # Adding 'libdir' from the .la file to our library search paths -+ # breaks crosscompilation horribly. We cheat here and don't add -+ # it, instead adding the path where we found the .la. -CL -+ dir="$abs_ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ #dir="$libdir" -+ #absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5408,13 +5418,16 @@ - ;; - esac - else -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- test -z "$libdir" && \ -- func_fatal_error "\`$deplib' is not a valid libtool archive" -- test "$absdir" != "$libdir" && \ -- func_warning "\`$deplib' seems to be moved" -- -- path="-L$absdir" -+# This interferes with crosscompilation. -CL -+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+# test -z "$libdir" && \ -+# func_fatal_error "\`$deplib' is not a valid libtool archive" -+# test "$absdir" != "$libdir" && \ -+# func_warning "\`$deplib' seems to be moved" -+# -+# path="-L$absdir" -+ path="-L$absdir/$objdir" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - fi - ;; - esac -@@ -7520,6 +7533,10 @@ - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do -+ # Replacing uninstalled with installed can easily break crosscompilation, -+ # since the installed path is generally the wrong architecture. -CL -+ newdependency_libs="$newdependency_libs $deplib" -+ continue - case $deplib in - *.la) - func_basename "$deplib"
package/freetype/freetype.mk +0 -1
@@ -6,7 +6,6 @@ FREETYPE_VERSION = 2.3.12 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 -FREETYPE_LIBTOOL_PATCH = NO FREETYPE_INSTALL_STAGING = YES FREETYPE_INSTALL_TARGET = YES FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
Signature · 1 line
1.7.1
PATCH 5/7 Removed libmpd-0.17.0-libdir-la.patch
In reply to llandwerlin at gmail.comFrom: Martin Banky <[email protected]>
Now that libmpd.mk has been converted to autotools infrastructure, the patch is no longer needed. Autotools will automatically apply the needed patch.
--- .../libmpd/libmpd-0.17.0-libdir-la.patch | 89 -------------------- package/multimedia/libmpd/libmpd.mk | 1 - 2 files changed, 0 insertions(+), 90 deletions(-) delete mode 100644 package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch
package/multimedia/libmpd/libmpd-0.17.0-libdir-la.patch deleted +0 -89
@@ -1,89 +0,0 @@ ---- - ltmain.sh | 39 +++++++++++++++++++++++++++++++++------ - 1 file changed, 33 insertions(+), 6 deletions(-) - -Index: libmpd-0.17.0/ltmain.sh -=================================================================== ---- libmpd-0.17.0.orig/ltmain.sh -+++ libmpd-0.17.0/ltmain.sh -@@ -1056,7 +1056,9 @@ - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" -- func_fatal_error "specify a tag with \`--tag'" -+ $echo "$modename: defaulting to \`CC'" -+ $echo "$modename: if this is not correct, specify a tag with \`--tag'" -+# func_fatal_error "specify a tag with \`--tag'" - # else - # func_verbose "using $tagname tagged configuration" - fi -@@ -2025,8 +2027,13 @@ - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- test "$inst_prefix_dir" = "$destdir" && \ -- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" -+ # -+ # This breaks install into our staging area. -PB -+ # -+ # if test "$inst_prefix_dir" = "$destdir"; then -+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ # exit $EXIT_FAILURE -+ # fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -@@ -5419,8 +5426,14 @@ - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ # Adding 'libdir' from the .la file to our library search paths -+ # breaks crosscompilation horribly. We cheat here and don't add -+ # it, instead adding the path where we found the .la. -CL -+ dir="$abs_ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ #dir="$libdir" -+ #absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5571,7 +5584,7 @@ - *) - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -+ need_relink=no - fi - ;; - esac -@@ -5901,6 +5914,16 @@ - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in -+# This interferes with crosscompilation. -CL -+# else -+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+# if test -z "$libdir"; then -+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+# exit 1 -+# fi -+# if test "$absdir" != "$libdir"; then -+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+# fi - -L*) path="$deplib" ;; - *.la) - func_dirname "$deplib" "" "." -@@ -8059,6 +8082,10 @@ - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do -+ # Replacing uninstalled with installed can easily break crosscompilation, -+ # since the installed path is generally the wrong architecture. -CL -+ newdependency_libs="$newdependency_libs $deplib" -+ continue - case $deplib in - *.la) - func_basename "$deplib"
package/multimedia/libmpd/libmpd.mk +0 -1
@@ -7,7 +7,6 @@ LIBMPD_VERSION = 0.17.0 LIBMPD_SOURCE = libmpd-$(LIBMPD_VERSION).tar.gz LIBMPD_SITE = http://download.sarine.nl/download/Programs/gmpc/$(LIBMPD_VERSION)/ LIBMPD_INSTALL_STAGING = YES -LIBMPD_LIBTOOL_PATCH = NO LIBMPD_DEPENDENCIES = libglib2 $(eval $(call AUTOTARGETS,package/multimedia,libmpd))
Signature · 1 line
1.7.1
PATCH 6/7 libtool: bump to 2.2.10
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/libtool/libtool.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/libtool/libtool.mk +1 -1
@@ -3,7 +3,7 @@ # libtool # ############################################################# -LIBTOOL_VERSION = 1.5.24 +LIBTOOL_VERSION = 2.2.10 LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.gz LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool
Signature · 1 line
1.7.1
PATCH 7/7 libtool: avoid to patch ltmain.sh script in host-libtool package
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/libtool/libtool.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/libtool/libtool.mk +2 -0
@@ -16,6 +16,8 @@ endef HOST_LIBTOOL_POST_INSTALL_HOOKS += HOST_LIBTOOL_CUSTOM_INSTALL +HOST_LIBTOOL_LIBTOOL_PATCH = NO + $(eval $(call AUTOTARGETS,package,libtool)) $(eval $(call AUTOTARGETS,package,libtool,host))
Signature · 1 line
1.7.1
Thomas Petazzoni
Acked-byQuoted 7 lines · On Sat, 9 Oct 2010 12:52:47 +0200 llandwerlin at gmail.com wrote:
Here is a second version of a patch set mostly from Martin Banky to support libtool patching depending on the libtool script version. This also bumps libtool to version 2.2.10, so we can autoreconfigure packages depending on libtool 2.2 versions (gtk+, glib, etc...).
You can pull from :
git://git.potipota.net/buildrootmartins-libtool
Not tested, but on the principle:
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Gustavo Zacarias
Acked-byQuoted 8 lines · Thomas Petazzoni
Quoted 5 lines · On Sat, 9 Oct 2010 12:52:47 +0200 llandwerlin at gmail.com wrote:
Here is a second version of a patch set mostly from Martin Banky to support libtool patching depending on the libtool script version. This also bumps libtool to version 2.2.10, so we can autoreconfigure packages depending on libtool 2.2 versions (gtk+, glib, etc...).
Quoted 6 lines
Quoted 2 lines
You can pull from :
git://git.potipota.net/buildrootmartins-libtoolNot tested, but on the principle:
Acked-by Thomas Petazzoni <[email protected]>
Tested with a couple arm/powerpc builds, no issues so far.