From 1be4af3df29f643ddc3e1577523179b5920a39c4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Sep 2024 19:57:02 +0100 Subject: libtool: 2.5.1 -> 2.5.2 (From OE-Core rev: 279e6f4eaa6e47cbd2640c7afe699cda2a796514) Signed-off-by: Richard Purdie --- meta/recipes-devtools/libtool/libtool-2.5.1.inc | 36 ------------------ meta/recipes-devtools/libtool/libtool-2.5.2.inc | 36 ++++++++++++++++++ .../libtool/libtool-cross_2.5.1.bb | 43 ---------------------- .../libtool/libtool-cross_2.5.2.bb | 43 ++++++++++++++++++++++ .../libtool/libtool-native_2.5.1.bb | 11 ------ .../libtool/libtool-native_2.5.2.bb | 11 ++++++ .../libtool/libtool/fixinstall.patch | 35 +++++++++++------- meta/recipes-devtools/libtool/libtool_2.5.1.bb | 21 ----------- meta/recipes-devtools/libtool/libtool_2.5.2.bb | 21 +++++++++++ .../libtool/nativesdk-libtool_2.5.1.bb | 24 ------------ .../libtool/nativesdk-libtool_2.5.2.bb | 24 ++++++++++++ 11 files changed, 157 insertions(+), 148 deletions(-) delete mode 100644 meta/recipes-devtools/libtool/libtool-2.5.1.inc create mode 100644 meta/recipes-devtools/libtool/libtool-2.5.2.inc delete mode 100644 meta/recipes-devtools/libtool/libtool-cross_2.5.1.bb create mode 100644 meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb delete mode 100644 meta/recipes-devtools/libtool/libtool-native_2.5.1.bb create mode 100644 meta/recipes-devtools/libtool/libtool-native_2.5.2.bb delete mode 100644 meta/recipes-devtools/libtool/libtool_2.5.1.bb create mode 100644 meta/recipes-devtools/libtool/libtool_2.5.2.bb delete mode 100644 meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb create mode 100644 meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb (limited to 'meta') diff --git a/meta/recipes-devtools/libtool/libtool-2.5.1.inc b/meta/recipes-devtools/libtool/libtool-2.5.1.inc deleted file mode 100644 index 94344d4d41..0000000000 --- a/meta/recipes-devtools/libtool/libtool-2.5.1.inc +++ /dev/null @@ -1,36 +0,0 @@ -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." -HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" -SECTION = "devel" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " - -SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \ - file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \ - file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \ - file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \ - file://dont-depend-on-help2man.patch \ - file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ - file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ - file://nohardcodepaths.patch \ - " - -SRC_URI[sha256sum] = "6a83edafd42d4e2ebdc09579f99ce828d5f932f1738de02495cc8c2884e430ce" - -inherit autotools texinfo -EXTRA_AUTORECONF = "--exclude=libtoolize" - -CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep" - -DEPENDS = "libtool-native" - -PACKAGES =+ "libltdl" -FILES:${PN} += "${datadir}/aclocal" - -FILES:${PN}-dev:remove = "${datadir}/aclocal" -FILES:libltdl = "${libdir}/libltdl${SOLIBS}" - -export CONFIG_SHELL="/bin/bash" diff --git a/meta/recipes-devtools/libtool/libtool-2.5.2.inc b/meta/recipes-devtools/libtool/libtool-2.5.2.inc new file mode 100644 index 0000000000..bde80e12ce --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-2.5.2.inc @@ -0,0 +1,36 @@ +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." +HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" +SECTION = "devel" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " + +SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \ + file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \ + file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \ + file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \ + file://dont-depend-on-help2man.patch \ + file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ + file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ + file://nohardcodepaths.patch \ + " + +SRC_URI[sha256sum] = "29275fb45b236d6ff720a433f9cd5f61ea2f52cc3aa2e5f89ba57726bda54793" + +inherit autotools texinfo +EXTRA_AUTORECONF = "--exclude=libtoolize" + +CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep" + +DEPENDS = "libtool-native" + +PACKAGES =+ "libltdl" +FILES:${PN} += "${datadir}/aclocal" + +FILES:${PN}-dev:remove = "${datadir}/aclocal" +FILES:libltdl = "${libdir}/libltdl${SOLIBS}" + +export CONFIG_SHELL="/bin/bash" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.5.1.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.1.bb deleted file mode 100644 index 18849cb8ef..0000000000 --- a/meta/recipes-devtools/libtool/libtool-cross_2.5.1.bb +++ /dev/null @@ -1,43 +0,0 @@ -require libtool-${PV}.inc - -PACKAGES = "" -SRC_URI += "file://fixinstall.patch" - -datadir = "${STAGING_DIR_TARGET}${target_datadir}" - -inherit nopackages - -# -# ccache may or may not be INHERITED, we remove references to it so the sstate -# artefact works on a machine where its not present. libtool-cross isn't used -# heavily so any performance issue is minor. -# Find references to LTCC="ccache xxx-gcc" and CC="ccache xxx-gcc" -# -do_install () { - ln -s false ${D} - install -d ${D}${bindir_crossscripts}/ - install -m 0755 libtool ${D}${bindir_crossscripts}/libtool - sed -e 's@^\(predep_objects="\).*@\1"@' \ - -e 's@^\(postdep_objects="\).*@\1"@' \ - -e 's@^CC="ccache.@CC="@' \ - -e 's@^LTCC="ccache.@LTCC="@' \ - -i ${D}${bindir_crossscripts}/libtool - sed -i '/^archive_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/libtool - sed -i '/^archive_expsym_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/libtool - GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize - chmod 0755 ${D}${bindir_crossscripts}/libtoolize - install -d ${D}${target_datadir}/libtool/build-aux/ - install -d ${D}${target_datadir}/aclocal/ - install -c ${S}/build-aux/compile ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/config.guess ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/config.sub ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/depcomp ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/install-sh ${D}${target_datadir}/libtool/build-aux/ - install -c ${S}/build-aux/missing ${D}${target_datadir}/libtool/build-aux/ - install -c -m 0644 ${S}/build-aux/ltmain.sh ${D}${target_datadir}/libtool/build-aux/ - install -c -m 0644 ${S}/m4/*.m4 ${D}${target_datadir}/aclocal/ -} - -SYSROOT_DIRS += "${bindir_crossscripts} ${target_datadir}" - -SSTATE_SCAN_FILES += "libtoolize *-libtool" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb new file mode 100644 index 0000000000..18849cb8ef --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.2.bb @@ -0,0 +1,43 @@ +require libtool-${PV}.inc + +PACKAGES = "" +SRC_URI += "file://fixinstall.patch" + +datadir = "${STAGING_DIR_TARGET}${target_datadir}" + +inherit nopackages + +# +# ccache may or may not be INHERITED, we remove references to it so the sstate +# artefact works on a machine where its not present. libtool-cross isn't used +# heavily so any performance issue is minor. +# Find references to LTCC="ccache xxx-gcc" and CC="ccache xxx-gcc" +# +do_install () { + ln -s false ${D} + install -d ${D}${bindir_crossscripts}/ + install -m 0755 libtool ${D}${bindir_crossscripts}/libtool + sed -e 's@^\(predep_objects="\).*@\1"@' \ + -e 's@^\(postdep_objects="\).*@\1"@' \ + -e 's@^CC="ccache.@CC="@' \ + -e 's@^LTCC="ccache.@LTCC="@' \ + -i ${D}${bindir_crossscripts}/libtool + sed -i '/^archive_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/libtool + sed -i '/^archive_expsym_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/libtool + GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize + chmod 0755 ${D}${bindir_crossscripts}/libtoolize + install -d ${D}${target_datadir}/libtool/build-aux/ + install -d ${D}${target_datadir}/aclocal/ + install -c ${S}/build-aux/compile ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/config.guess ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/config.sub ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/depcomp ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/install-sh ${D}${target_datadir}/libtool/build-aux/ + install -c ${S}/build-aux/missing ${D}${target_datadir}/libtool/build-aux/ + install -c -m 0644 ${S}/build-aux/ltmain.sh ${D}${target_datadir}/libtool/build-aux/ + install -c -m 0644 ${S}/m4/*.m4 ${D}${target_datadir}/aclocal/ +} + +SYSROOT_DIRS += "${bindir_crossscripts} ${target_datadir}" + +SSTATE_SCAN_FILES += "libtoolize *-libtool" diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.1.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.1.bb deleted file mode 100644 index be96b52dd6..0000000000 --- a/meta/recipes-devtools/libtool/libtool-native_2.5.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require libtool-${PV}.inc - -DEPENDS = "" - -inherit native - -do_install () { - autotools_do_install - install -d ${D}${bindir}/ - install -m 0755 libtool ${D}${bindir}/libtool -} diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.2.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.2.bb new file mode 100644 index 0000000000..be96b52dd6 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-native_2.5.2.bb @@ -0,0 +1,11 @@ +require libtool-${PV}.inc + +DEPENDS = "" + +inherit native + +do_install () { + autotools_do_install + install -d ${D}${bindir}/ + install -m 0755 libtool ${D}${bindir}/libtool +} diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/fixinstall.patch index 48330d82fb..94601b1beb 100644 --- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch +++ b/meta/recipes-devtools/libtool/libtool/fixinstall.patch @@ -18,10 +18,11 @@ RP 2011/11/16 Updated by: Robert Yang -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -2355,7 +2355,7 @@ func_mode_install () +Index: libtool-2.5.2/build-aux/ltmain.in +=================================================================== +--- libtool-2.5.2.orig/build-aux/ltmain.in ++++ libtool-2.5.2/build-aux/ltmain.in +@@ -2381,7 +2381,7 @@ func_mode_install () dir=$func_dirname_result func_append dir "$objdir" @@ -29,8 +30,8 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in + if test "$fast_install" = no && test -n "$relink_command"; then # Strip any trailing slash from the destination. func_stripname '' '/' "$libdir" - destlibdir=$func_stripname_result -@@ -2394,7 +2394,7 @@ func_mode_install () + destlibdir=$func_stripname_result +@@ -2419,7 +2419,7 @@ func_mode_install () shift srcname=$realname @@ -39,7 +40,7 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ -@@ -6162,15 +6162,15 @@ func_mode_link () +@@ -6276,17 +6276,17 @@ func_mode_link () # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -48,7 +49,9 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) func_append compile_rpath " $absdir" ;; +- *) case $absdir in +- "$progdir/"*) func_append compile_rpath " $absdir" ;; +- esac - esac - ;; - esac @@ -57,14 +60,16 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in + #*) + # case "$compile_rpath " in + # *" $absdir "*) ;; -+ # *) func_append compile_rpath " $absdir" ;; ++ # *) case $absdir in ++ # "$progdir/"*) func_append compile_rpath " $absdir" ;; ++ # esac + # esac + # ;; + #esac case " $sys_lib_dlsearch_path " in *" $libdir "*) ;; *) -@@ -6236,15 +6236,15 @@ func_mode_link () +@@ -6352,17 +6352,17 @@ func_mode_link () # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -73,7 +78,9 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) func_append compile_rpath " $absdir" ;; +- *) case $absdir in +- "$progdir/"*) func_append compile_rpath " $absdir" ;; +- esac - esac - ;; - esac @@ -82,14 +89,16 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in + #*) + # case "$compile_rpath " in + # *" $absdir "*) ;; -+ # *) func_append compile_rpath " $absdir" ;; ++ # *) case $absdir in ++ # "$progdir/"*) func_append compile_rpath " $absdir" ;; ++ # esac + # esac + # ;; + #esac case " $sys_lib_dlsearch_path " in *" $libdir "*) ;; *) -@@ -6590,8 +6590,8 @@ func_mode_link () +@@ -6705,8 +6705,8 @@ func_mode_link () eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "'$deplib' is not a valid libtool archive" diff --git a/meta/recipes-devtools/libtool/libtool_2.5.1.bb b/meta/recipes-devtools/libtool/libtool_2.5.1.bb deleted file mode 100644 index c1e315aece..0000000000 --- a/meta/recipes-devtools/libtool/libtool_2.5.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -require libtool-${PV}.inc -require remove-buildpaths.inc - -SRC_URI += "file://multilib.patch" - -RDEPENDS:${PN} += "bash" - -# -# We want the results of libtool-cross preserved - don't stage anything ourselves. -# -SYSROOT_DIRS_IGNORE += " \ - ${bindir} \ - ${datadir}/aclocal \ - ${datadir}/libtool/build-aux \ -" - -ACLOCALEXTRAPATH:class-target = "" - -inherit multilib_script - -MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool" diff --git a/meta/recipes-devtools/libtool/libtool_2.5.2.bb b/meta/recipes-devtools/libtool/libtool_2.5.2.bb new file mode 100644 index 0000000000..c1e315aece --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool_2.5.2.bb @@ -0,0 +1,21 @@ +require libtool-${PV}.inc +require remove-buildpaths.inc + +SRC_URI += "file://multilib.patch" + +RDEPENDS:${PN} += "bash" + +# +# We want the results of libtool-cross preserved - don't stage anything ourselves. +# +SYSROOT_DIRS_IGNORE += " \ + ${bindir} \ + ${datadir}/aclocal \ + ${datadir}/libtool/build-aux \ +" + +ACLOCALEXTRAPATH:class-target = "" + +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool" diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb deleted file mode 100644 index 2589bd617e..0000000000 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -require libtool-${PV}.inc -require remove-buildpaths.inc - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" - -SRC_URI += "file://fixinstall.patch" - -inherit nativesdk - -S = "${WORKDIR}/libtool-${PV}" -FILES:${PN} += "${datadir}/libtool/*" - -do_install () { - autotools_do_install - install -d ${D}${bindir}/ - install -m 0755 libtool ${D}${bindir}/ -} - -SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" - -libtoolnativesdk_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/libtool -} diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb new file mode 100644 index 0000000000..2589bd617e --- /dev/null +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.2.bb @@ -0,0 +1,24 @@ +require libtool-${PV}.inc +require remove-buildpaths.inc + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" + +SRC_URI += "file://fixinstall.patch" + +inherit nativesdk + +S = "${WORKDIR}/libtool-${PV}" +FILES:${PN} += "${datadir}/libtool/*" + +do_install () { + autotools_do_install + install -d ${D}${bindir}/ + install -m 0755 libtool ${D}${bindir}/ +} + +SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" + +libtoolnativesdk_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/libtool +} -- cgit v1.2.3-54-g00ecf