summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/libtool')
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.4.inc (renamed from meta/recipes-devtools/libtool/libtool-2.4.2.inc)16
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.4.4.bb (renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb)22
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.4.4.bb (renamed from meta/recipes-devtools/libtool/libtool-native_2.4.2.bb)1
-rw-r--r--meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch39
-rw-r--r--meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch32
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch22
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch15
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-rpath.patch8
-rw-r--r--meta/recipes-devtools/libtool/libtool/fixinstall.patch35
-rw-r--r--meta/recipes-devtools/libtool/libtool/norm-rpath.patch8
-rw-r--r--meta/recipes-devtools/libtool/libtool/prefix.patch121
-rw-r--r--meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch68
-rw-r--r--meta/recipes-devtools/libtool/libtool/respect-fstack-protector.patch53
-rw-r--r--meta/recipes-devtools/libtool/libtool/trailingslash.patch11
-rw-r--r--meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch12
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.4.4.bb (renamed from meta/recipes-devtools/libtool/libtool_2.4.2.bb)4
-rw-r--r--meta/recipes-devtools/libtool/nativesdk-libtool_2.4.4.bb (renamed from meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb)2
17 files changed, 184 insertions, 285 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.4.inc
index 0f1964b57b..643fd52a9c 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.4.inc
@@ -5,31 +5,27 @@ Libtool hides the complexity of generating special library types \
5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" 5HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
6SECTION = "devel" 6SECTION = "devel"
7LICENSE = "GPLv2 & LGPLv2.1" 7LICENSE = "GPLv2 & LGPLv2.1"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" 9 file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c "
10
11INC_PR = "r6"
12 10
13SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
14 file://trailingslash.patch \ 12 file://trailingslash.patch \
15 file://rename-with-sysroot.patch \ 13 file://rename-with-sysroot.patch \
16 file://use-sysroot-in-libpath.patch \ 14 file://use-sysroot-in-libpath.patch \
17 file://fix-final-rpath.patch \ 15 file://fix-final-rpath.patch \
18 file://avoid_absolute_paths_for_general_utils.patch \
19 file://fix-rpath.patch \ 16 file://fix-rpath.patch \
20 file://respect-fstack-protector.patch \
21 file://norm-rpath.patch \ 17 file://norm-rpath.patch \
22 file://dont-depend-on-help2man.patch \ 18 file://dont-depend-on-help2man.patch \
23 file://fix-resolve-lt-sysroot.patch \ 19 file://fix-resolve-lt-sysroot.patch \
24 " 20 "
25 21
26SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50" 22SRC_URI[md5sum] = "353ed373fd3c6d7e47a1f4a8728d966b"
27SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" 23SRC_URI[sha256sum] = "159d4e20c201f929e3562536d3ae6b5e605403fa4bb4e72ef197a4e162c3fedf"
28 24
29do_compile_prepend () { 25do_compile_prepend () {
30 # Sometimes this file doesn't get rebuilt, force the issue 26 # Sometimes this file doesn't get rebuilt, force the issue
31 rm -f ${S}/libltdl/config/ltmain.sh 27 rm -f ${S}/build-aux/ltmain.sh
32 make libltdl/config/ltmain.sh 28 make build-aux/ltmain.sh
33 ./config.status 29 ./config.status
34} 30}
35 31
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.4.bb
index 34aae0bf13..847880270d 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.4.bb
@@ -1,6 +1,5 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PR = "${INC_PR}.1"
4PACKAGES = "" 3PACKAGES = ""
5SRC_URI += "file://prefix.patch" 4SRC_URI += "file://prefix.patch"
6SRC_URI += "file://fixinstall.patch" 5SRC_URI += "file://fixinstall.patch"
@@ -18,17 +17,18 @@ do_install () {
18 install -d ${D}${bindir_crossscripts}/ 17 install -d ${D}${bindir_crossscripts}/
19 install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool 18 install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
20 install -d ${D}${bindir_crossscripts}/ 19 install -d ${D}${bindir_crossscripts}/
21 install -m 0755 libtoolize ${D}${bindir_crossscripts}/ 20 GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize
22 install -d ${D}${target_datadir}/libtool/config/ 21 chmod 0755 ${D}${bindir_crossscripts}/libtoolize
22 install -d ${D}${target_datadir}/libtool/build-aux/
23 install -d ${D}${target_datadir}/aclocal/ 23 install -d ${D}${target_datadir}/aclocal/
24 install -c ${S}/libltdl/config/compile ${D}${target_datadir}/libtool/config/ 24 install -c ${S}/build-aux/compile ${D}${target_datadir}/libtool/build-aux/
25 install -c ${S}/libltdl/config/config.guess ${D}${target_datadir}/libtool/config/ 25 install -c ${S}/build-aux/config.guess ${D}${target_datadir}/libtool/build-aux/
26 install -c ${S}/libltdl/config/config.sub ${D}${target_datadir}/libtool/config/ 26 install -c ${S}/build-aux/config.sub ${D}${target_datadir}/libtool/build-aux/
27 install -c ${S}/libltdl/config/depcomp ${D}${target_datadir}/libtool/config/ 27 install -c ${S}/build-aux/depcomp ${D}${target_datadir}/libtool/build-aux/
28 install -c ${S}/libltdl/config/install-sh ${D}${target_datadir}/libtool/config/ 28 install -c ${S}/build-aux/install-sh ${D}${target_datadir}/libtool/build-aux/
29 install -c ${S}/libltdl/config/missing ${D}${target_datadir}/libtool/config/ 29 install -c ${S}/build-aux/missing ${D}${target_datadir}/libtool/build-aux/
30 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${target_datadir}/libtool/config/ 30 install -c -m 0644 ${S}/build-aux/ltmain.sh ${D}${target_datadir}/libtool/build-aux/
31 install -c -m 0644 ${S}/libltdl/m4/*.m4 ${D}${target_datadir}/aclocal/ 31 install -c -m 0644 ${S}/m4/*.m4 ${D}${target_datadir}/aclocal/
32} 32}
33 33
34SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" 34SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.4.bb
index f03859e061..4c5218ade0 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.4.bb
@@ -2,7 +2,6 @@ require libtool-${PV}.inc
2 2
3DEPENDS = "" 3DEPENDS = ""
4 4
5PR = "${INC_PR}.1"
6SRC_URI += "file://prefix.patch" 5SRC_URI += "file://prefix.patch"
7 6
8inherit native 7inherit native
diff --git a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch
deleted file mode 100644
index 3c751ed0e2..0000000000
--- a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Pending
2
3On some distro the path of utils like sed, grep etc are different than the
4buildhost system.
5 This was causing runtime issue while running libtoolize from the
6libtool-nativesdk package.
7 This patch takes out the absolute paths of these utils, and put
8responsibility on the end-user to set correct paths for these utilities to be
9found out.
10
11Nitin A Kamble <nitin.a.kamble@intel.com>
122011/02/18
13
14
15Index: libtool-2.4.2/libltdl/config/general.m4sh
16===================================================================
17--- libtool-2.4.2.orig/libltdl/config/general.m4sh
18+++ libtool-2.4.2/libltdl/config/general.m4sh
19@@ -45,15 +45,15 @@ progpath="$0"
20 M4SH_VERBATIM([[
21 : ${CP="cp -f"}
22 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
23-: ${EGREP="@EGREP@"}
24-: ${FGREP="@FGREP@"}
25-: ${GREP="@GREP@"}
26-: ${LN_S="@LN_S@"}
27+: ${EGREP="egrep"}
28+: ${FGREP="fgrep"}
29+: ${GREP="grep"}
30+: ${LN_S="ln -s"}
31 : ${MAKE="make"}
32 : ${MKDIR="mkdir"}
33 : ${MV="mv -f"}
34 : ${RM="rm -f"}
35-: ${SED="@SED@"}
36+: ${SED="sed"}
37 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
38 : ${Xsed="$SED -e 1s/^X//"}
39
diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
index 67552b0ff5..fd4084c859 100644
--- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
+++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
@@ -1,24 +1,30 @@
1Upstream-Status: Inappropriate 1Upstream-Status: Inappropriate
2 2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libtool-2.4.2/Makefile.am libtool-2.4.2/Makefile.am 4Updated by: Robert Yang <liezhi.yang@windriver.com>
5--- libtool-2.4.2/Makefile.am 2011-10-17 13:17:04.000000000 +0300
6+++ libtool-2.4.2/Makefile.am 2013-01-01 22:03:36.865586811 +0200
7@@ -327,17 +327,6 @@
8 cd $(srcdir)/doc && \
9 $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi
10 5
11-dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1 6diff --git a/Makefile.am b/Makefile.am
7--- a/Makefile.am
8+++ b/Makefile.am
9@@ -404,21 +404,6 @@ $(notes_txt): $(notes_texi)
10 $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
11 $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
12
13-dist_man1_MANS = $(libtool_1) $(libtoolize_1)
12-MAINTAINERCLEANFILES += $(dist_man1_MANS) 14-MAINTAINERCLEANFILES += $(dist_man1_MANS)
13-update_mans = \ 15-update_mans = \
14- PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ 16- PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
15- $(HELP2MAN) --output=$@ 17- $(HELP2MAN) --output='$@'
16-$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh
17- $(update_mans) --help-option=--help-all libtool
18-$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in
19- $(update_mans) libtoolize
20- 18-
19-# It's wrong to make distributed files (e.g. $(libtool_1)) rely on
20-# files created in the build tree, so instead we regenerate the
21-# manual pages if the sources for the build-tree files we want to
22-# run have changed.
23-$(libtool_1): $(ltmain_sh)
24- $(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
25-$(libtoolize_1): $(libtoolize_in)
26- $(AM_V_GEN)$(update_mans) libtoolize
21- 27-
28
22 ## ------------- ## 29 ## ------------- ##
23 ## Installation. ## 30 ## Installation. ##
24 ## ------------- ##
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
index 6f9d321eb3..5c9f8cc9c0 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
@@ -7,13 +7,13 @@ This works around the issue until it gets sorted out upstream.
7Fix suggested by Richard Purdie <richard.purdie@intel.com> 7Fix suggested by Richard Purdie <richard.purdie@intel.com>
8Signed-off-by: Scott Garman <scott.a.garman@intel.com> 8Signed-off-by: Scott Garman <scott.a.garman@intel.com>
9Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> 9Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
10Updated by: Robert Yang <liezhi.yang@windriver.com>
10 11
11Index: libtool-2.4.2/libltdl/config/ltmain.m4sh 12diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
12=================================================================== 13--- a/build-aux/ltmain.in
13--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh 14+++ b/build-aux/ltmain.in
14+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 15@@ -7569,9 +7569,11 @@ EOF
15@@ -7268,9 +7268,11 @@ 16 test relink = "$opt_mode" || rpath=$compile_rpath$rpath
16 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
17 for libdir in $rpath; do 17 for libdir in $rpath; do
18 if test -n "$hardcode_libdir_flag_spec"; then 18 if test -n "$hardcode_libdir_flag_spec"; then
19+ func_replace_sysroot "$libdir" 19+ func_replace_sysroot "$libdir"
@@ -24,9 +24,9 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
24- func_replace_sysroot "$libdir" 24- func_replace_sysroot "$libdir"
25- libdir=$func_replace_sysroot_result 25- libdir=$func_replace_sysroot_result
26 if test -z "$hardcode_libdirs"; then 26 if test -z "$hardcode_libdirs"; then
27 hardcode_libdirs="$libdir" 27 hardcode_libdirs=$libdir
28 else 28 else
29@@ -7999,6 +8001,10 @@ 29@@ -8301,6 +8303,10 @@ EOF
30 hardcode_libdirs= 30 hardcode_libdirs=
31 for libdir in $compile_rpath $finalize_rpath; do 31 for libdir in $compile_rpath $finalize_rpath; do
32 if test -n "$hardcode_libdir_flag_spec"; then 32 if test -n "$hardcode_libdir_flag_spec"; then
@@ -36,8 +36,8 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
36+ libdir=$func_stripname_result 36+ libdir=$func_stripname_result
37 if test -n "$hardcode_libdir_separator"; then 37 if test -n "$hardcode_libdir_separator"; then
38 if test -z "$hardcode_libdirs"; then 38 if test -z "$hardcode_libdirs"; then
39 hardcode_libdirs="$libdir" 39 hardcode_libdirs=$libdir
40@@ -8050,6 +8056,10 @@ 40@@ -8352,6 +8358,10 @@ EOF
41 hardcode_libdirs= 41 hardcode_libdirs=
42 for libdir in $finalize_rpath; do 42 for libdir in $finalize_rpath; do
43 if test -n "$hardcode_libdir_flag_spec"; then 43 if test -n "$hardcode_libdir_flag_spec"; then
@@ -47,4 +47,4 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
47+ libdir=$func_stripname_result 47+ libdir=$func_stripname_result
48 if test -n "$hardcode_libdir_separator"; then 48 if test -n "$hardcode_libdir_separator"; then
49 if test -z "$hardcode_libdirs"; then 49 if test -z "$hardcode_libdirs"; then
50 hardcode_libdirs="$libdir" 50 hardcode_libdirs=$libdir
diff --git a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
index 44e9fe17ae..1bd95980c0 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
@@ -10,17 +10,18 @@ I have also reported the problem to libtool here
10http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html 10http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html
11 11
12Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com> 12Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com>
13Updated by: Robert Yang <liezhi.yang@windriver.com>
13--- 14---
14diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4 15diff --git a/m4/libtool.m4 b/m4/libtool.m4
15--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2013-09-13 22:37:43.647282945 +0200 16--- a/m4/libtool.m4
16+++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-09-14 10:27:37.168178605 +0200 17+++ b/m4/libtool.m4
17@@ -1234,16 +1234,21 @@ 18@@ -1225,16 +1225,21 @@ dnl lt_sysroot will always be passed unquoted. We quote it here
18 dnl in case the user passed a directory name. 19 dnl in case the user passed a directory name.
19 lt_sysroot= 20 lt_sysroot=
20 case ${with_libtool_sysroot} in #( 21 case $with_libtool_sysroot in #(
21- yes) 22- yes)
22+ no) 23+ no)
23 if test "$GCC" = yes; then 24 if test yes = "$GCC"; then
24 lt_sysroot=`$CC --print-sysroot 2>/dev/null` 25 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
25+ # Treat "/" the same a an unset sysroot. It seems to be more 26+ # Treat "/" the same a an unset sysroot. It seems to be more
26+ # compatible across host platforms that way!? 27+ # compatible across host platforms that way!?
@@ -37,5 +38,5 @@ diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libto
37- no|'') 38- no|'')
38- ;; #( 39- ;; #(
39 *) 40 *)
40 AC_MSG_RESULT([${with_libtool_sysroot}]) 41 AC_MSG_RESULT([$with_libtool_sysroot])
41 AC_MSG_ERROR([The sysroot must be an absolute path.]) 42 AC_MSG_ERROR([The sysroot must be an absolute path.])
diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
index 1571178a6a..a2ec9473e7 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
@@ -6,10 +6,12 @@ RP 23/9/2011
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
9Index: libtool-2.4.2/libltdl/config/ltmain.m4sh 9Updated by: Robert Yang <liezhi.yang@windriver.com>
10
11Index: libtool-2.4.2/build-aux/ltmain.in
10=================================================================== 12===================================================================
11--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh 13--- libtool-2.4.2.orig/build-aux/ltmain.in
12+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 14+++ libtool-2.4.2/build-aux/ltmain.in
13@@ -7286,8 +7286,14 @@ EOF 15@@ -7286,8 +7286,14 @@ EOF
14 esac 16 esac
15 fi 17 fi
diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
index 279c07be37..8f343bf436 100644
--- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch
+++ b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
@@ -16,12 +16,13 @@ Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this]
16 16
17RP 2011/11/16 17RP 2011/11/16
18 18
19Index: libtool-2.4/libltdl/config/ltmain.m4sh 19Updated by: Robert Yang <liezhi.yang@windriver.com>
20=================================================================== 20
21--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-11-16 14:50:01.070383779 +0000 21diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
22+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-11-16 15:27:13.582310413 +0000 22--- a/build-aux/ltmain.in
23@@ -2163,7 +2163,7 @@ 23+++ b/build-aux/ltmain.in
24 dir="$func_dirname_result" 24@@ -2355,7 +2355,7 @@ func_mode_install ()
25 dir=$func_dirname_result
25 func_append dir "$objdir" 26 func_append dir "$objdir"
26 27
27- if test -n "$relink_command"; then 28- if test -n "$relink_command"; then
@@ -29,16 +30,16 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
29 # Strip any trailing slash from the destination. 30 # Strip any trailing slash from the destination.
30 func_stripname '' '/' "$libdir" 31 func_stripname '' '/' "$libdir"
31 destlibdir=$func_stripname_result 32 destlibdir=$func_stripname_result
32@@ -2202,7 +2202,7 @@ 33@@ -2394,7 +2394,7 @@ func_mode_install ()
33 shift 34 shift
34 35
35 srcname="$realname" 36 srcname=$realname
36- test -n "$relink_command" && srcname="$realname"T 37- test -n "$relink_command" && srcname=${realname}T
37+ test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T 38+ test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T
38 39
39 # Install the shared library and build the symlinks. 40 # Install the shared library and build the symlinks.
40 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 41 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
41@@ -5856,15 +5856,15 @@ 42@@ -6162,15 +6162,15 @@ func_mode_link ()
42 # Hardcode the library path. 43 # Hardcode the library path.
43 # Skip directories that are in the system default run-time 44 # Skip directories that are in the system default run-time
44 # search path. 45 # search path.
@@ -63,7 +64,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
63 case " $sys_lib_dlsearch_path " in 64 case " $sys_lib_dlsearch_path " in
64 *" $libdir "*) ;; 65 *" $libdir "*) ;;
65 *) 66 *)
66@@ -5930,15 +5930,15 @@ 67@@ -6236,15 +6236,15 @@ func_mode_link ()
67 # Hardcode the library path. 68 # Hardcode the library path.
68 # Skip directories that are in the system default run-time 69 # Skip directories that are in the system default run-time
69 # search path. 70 # search path.
@@ -88,14 +89,14 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
88 case " $sys_lib_dlsearch_path " in 89 case " $sys_lib_dlsearch_path " in
89 *" $libdir "*) ;; 90 *" $libdir "*) ;;
90 *) 91 *)
91@@ -6284,8 +6284,8 @@ 92@@ -6590,8 +6590,8 @@ func_mode_link ()
92 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 93 eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
93 test -z "$libdir" && \ 94 test -z "$libdir" && \
94 func_fatal_error "\`$deplib' is not a valid libtool archive" 95 func_fatal_error "'$deplib' is not a valid libtool archive"
95- test "$absdir" != "$libdir" && \ 96- test "$absdir" != "$libdir" && \
96- func_warning "\`$deplib' seems to be moved" 97- func_warning "'$deplib' seems to be moved"
97+ #test "$absdir" != "$libdir" && \ 98+ #test "$absdir" != "$libdir" && \
98+ # func_warning "\`$deplib' seems to be moved" 99+ # func_warning "'$deplib' seems to be moved"
99 100
100 path="-L$absdir" 101 path=-L$absdir
101 fi 102 fi
diff --git a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
index dce1576c41..1e4c65e024 100644
--- a/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
@@ -7,9 +7,11 @@ RPATH in the generated binary. Normalize before comparision.
7Signed-off-by: Andy Ross <andy.ross@windriver.com> 7Signed-off-by: Andy Ross <andy.ross@windriver.com>
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10diff -ur a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh 10Updated by: Robert Yang <liezhi.yang@windriver.com>
11--- a/libltdl/config/ltmain.m4sh 2012-08-16 13:58:55.058900363 -0700 11
12+++ b/libltdl/config/ltmain.m4sh 2012-08-22 11:01:34.191345989 -0700 12diff -ur a/build-aux/ltmain.in b/build-aux/ltmain.in
13--- a/build-aux/ltmain.in 2012-08-16 13:58:55.058900363 -0700
14+++ b/build-aux/ltmain.in 2012-08-22 11:01:34.191345989 -0700
13@@ -7288,8 +7288,10 @@ 15@@ -7288,8 +7288,10 @@
14 else 16 else
15 # We only want to hardcode in an rpath if it isn't in the 17 # We only want to hardcode in an rpath if it isn't in the
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch
index 5e46e68f03..a73df2e4a7 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
@@ -18,35 +18,13 @@ the simplest fix is just to remove $SHELL.
18Updated: Date: 2011/11/09 18Updated: Date: 2011/11/09
19RP 19RP
20 20
21Index: libtool-2.4.2/libltdl/m4/libtool.m4 21Updated by: Robert Yang <liezhi.yang@windriver.com>
22=================================================================== 22
23--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 23diff --git a/Makefile.am b/Makefile.am
24+++ libtool-2.4.2/libltdl/m4/libtool.m4 24--- a/Makefile.am
25@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) 25+++ b/Makefile.am
26 LIBTOOL_DEPS="$ltmain" 26@@ -31,7 +31,7 @@ SUBDIRS = .
27 27 DIST_SUBDIRS = $(SUBDIRS)
28 # Always use our own libtool.
29-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
30+LIBTOOL='$(top_builddir)'
31+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
32 AC_SUBST(LIBTOOL)dnl
33
34 _LT_SETUP
35@@ -206,7 +207,7 @@ aix3*)
36 esac
37
38 # Global variables:
39-ofile=libtool
40+ofile=${host_alias}-libtool
41 can_build_shared=yes
42
43 # All known linkers require a `.a' archive for static linking (except MSVC,
44Index: libtool-2.4.2/Makefile.am
45===================================================================
46--- libtool-2.4.2.orig/Makefile.am
47+++ libtool-2.4.2/Makefile.am
48@@ -31,7 +31,7 @@ AM_LDFLAGS =
49 DIST_SUBDIRS = .
50 EXTRA_DIST = 28 EXTRA_DIST =
51 29
52-BUILT_SOURCES = libtool libtoolize 30-BUILT_SOURCES = libtool libtoolize
@@ -54,58 +32,67 @@ Index: libtool-2.4.2/Makefile.am
54 32
55 CLEANFILES = 33 CLEANFILES =
56 MOSTLYCLEANFILES = 34 MOSTLYCLEANFILES =
57@@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li 35@@ -67,7 +67,7 @@ build_scripts = $(srcdir)/$(aux_dir)/announce-gen \
58 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ 36
59 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ 37 EXTRA_DIST += bootstrap bootstrap.conf $(build_scripts) cfg.mk maint.mk \
60 ChangeLog.2008 ChangeLog.2009 ChangeLog.2010 38 GNUmakefile
61-CLEANFILES += libtool libtoolize libtoolize.tmp \ 39-CLEANFILES += libtool libtoolize
62+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ 40+CLEANFILES += $(host_alias)-libtool libtoolize
63 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
64 41
65 ## These are the replacements that need to be made at bootstrap time, 42 ## If a file is named several times below, and especially if it
66@@ -231,7 +231,7 @@ configure_edit = sed \ 43 ## is a distributed file created during Libtool bootstrap, we
67 -e 's,@SED\@,$(SED),g' 44@@ -276,7 +276,7 @@ configure_edit = $(bootstrap_edit) \
45 -e 's|@srcdir\@|$(srcdir)|g'
68 46
69 # The libtool distributor and the standalone libtool script. 47 # The libtool distributor and the standalone libtool script.
70-bin_SCRIPTS = libtoolize libtool 48-bin_SCRIPTS = libtool
71+bin_SCRIPTS = libtoolize $(host_alias)-libtool 49+bin_SCRIPTS = $(host_alias)-libtool
72 50
73 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status 51 libtoolize: $(libtoolize_in) $(config_status)
74 rm -f libtoolize.tmp libtoolize 52 $(AM_V_at)rm -f '$@'
75@@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to 53@@ -287,7 +287,7 @@ libtoolize: $(libtoolize_in) $(config_status)
76 # We used to do this with a 'stamp-vcl' file, but non-gmake builds 54 # We used to do this with a 'stamp-vcl' file, but non-gmake builds
77 # would rerun configure on every invocation, so now we manually 55 # would rerun configure on every invocation, so now we manually
78 # check the version numbers from the build rule when necessary. 56 # check the version numbers from the build rule when necessary.
79-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog 57-libtool: $(ltmain_sh) $(config_status) $(dotversion)
80- @target=libtool; $(rebuild); \ 58+$(host_alias)-libtool: $(ltmain_sh) $(config_status) $(dotversion)
81+$(host_alias)-libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh ChangeLog 59 @$(rebuild); \
82+ @target=$(host_alias)-libtool; $(rebuild); \ 60 if test -f '$@'; then \
83 if test -f "$$target"; then \ 61 eval `'$(SED)' -n '/^package_revision=/p' '$@'`; \
84 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ 62@@ -731,12 +731,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
85 test "$$actualver" = "$$correctver" && rebuild=false; \
86@@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $
87 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
88 done; \
89 if $$rebuild; then \
90- echo $(SHELL) ./config.status $$target; \
91- cd $(top_builddir) && $(SHELL) ./config.status $$target; \
92+ echo $(SHELL) ./config.status libtool; \
93+ cd $(top_builddir) && $(SHELL) ./config.status libtool; \
94 fi
95
96 .PHONY: configure-subdirs
97@@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
98 63
99 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ 64 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
100 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ 65 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
101- LIBTOOL="$(abs_top_builddir)/libtool" \ 66- LIBTOOL="$(abs_top_builddir)/libtool" \
102+ LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \ 67+ LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \
103 tst_aclocaldir="$(abs_top_srcdir)/libltdl/m4" 68 tst_aclocaldir="$(abs_top_srcdir)/m4"
104 69
105 INSTALLCHECK_ENVIRONMENT = \ 70 INSTALLCHECK_ENVIRONMENT = \
106 LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \ 71 LIBTOOLIZE="$(bindir)/`echo libtoolize |$(SED) '$(program_transform_name)'`" \
107- LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`" \ 72- LIBTOOL="$(bindir)/`echo libtool |$(SED) '$(program_transform_name)'`" \
108+ LIBTOOL="$(bindir)/`echo $(host_alias)-libtool | sed '$(program_transform_name)'`" \ 73+ LIBTOOL="$(bindir)/`echo $(host_alias)-libtool |$(SED) '$(program_transform_name)'`" \
109 LTDLINCL="-I$(includedir)" \ 74 LTDLINCL="-I$(includedir)" \
110 LIBLTDL="$(libdir)/libltdl.la" \ 75 LIBLTDL="$(libdir)/libltdl.la" \
111 tst_aclocaldir="$(aclocaldir)" 76 tst_aclocaldir="$(aclocaldir)"
77diff --git a/m4/libtool.m4 b/m4/libtool.m4
78--- a/m4/libtool.m4
79+++ b/m4/libtool.m4
80@@ -86,7 +86,8 @@ _LT_SET_OPTIONS([$0], [$1])
81 LIBTOOL_DEPS=$ltmain
82
83 # Always use our own libtool.
84-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
85+LIBTOOL='$(top_builddir)'
86+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
87 AC_SUBST(LIBTOOL)dnl
88
89 _LT_SETUP
90@@ -199,7 +200,7 @@ aix3*)
91 esac
92
93 # Global variables:
94-ofile=libtool
95+ofile=${host_alias}-libtool
96 can_build_shared=yes
97
98 # All known linkers require a '.a' archive for static linking (except MSVC,
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
index c3e3e867aa..ad2b110530 100644
--- a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
+++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
@@ -10,29 +10,31 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
10 10
11-Khem Raj <raj.khem@gmail.com> 11-Khem Raj <raj.khem@gmail.com>
12 12
13Index: libtool-2.4.2/libltdl/m4/libtool.m4 13Updated by: Robert Yang <liezhi.yang@windriver.com>
14=================================================================== 14
15--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 15diff --git a/m4/libtool.m4 b/m4/libtool.m4
16+++ libtool-2.4.2/libltdl/m4/libtool.m4 16--- a/m4/libtool.m4
17@@ -1224,27 +1224,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr 17+++ b/m4/libtool.m4
18@@ -1215,28 +1215,28 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
18 # ---------------- 19 # ----------------
19 AC_DEFUN([_LT_WITH_SYSROOT], 20 AC_DEFUN([_LT_WITH_SYSROOT],
20 [AC_MSG_CHECKING([for sysroot]) 21 [AC_MSG_CHECKING([for sysroot])
21-AC_ARG_WITH([sysroot], 22-AC_ARG_WITH([sysroot],
22-[ --with-sysroot[=DIR] Search for dependent libraries within DIR 23-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
23+AC_ARG_WITH([libtool-sysroot], 24+AC_ARG_WITH([libtool-sysroot],
24+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR 25+[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@],
25 (or the compiler's sysroot if not specified).], 26 [Search for dependent libraries within DIR (or the compiler's sysroot
27 if not specified).])],
26-[], [with_sysroot=no]) 28-[], [with_sysroot=no])
27+[], [with_libtool_sysroot=no]) 29+[], [with_libtool_sysroot=no])
28 30
29 dnl lt_sysroot will always be passed unquoted. We quote it here 31 dnl lt_sysroot will always be passed unquoted. We quote it here
30 dnl in case the user passed a directory name. 32 dnl in case the user passed a directory name.
31 lt_sysroot= 33 lt_sysroot=
32-case ${with_sysroot} in #( 34-case $with_sysroot in #(
33+case ${with_libtool_sysroot} in #( 35+case $with_libtool_sysroot in #(
34 yes) 36 yes)
35 if test "$GCC" = yes; then 37 if test yes = "$GCC"; then
36 lt_sysroot=`$CC --print-sysroot 2>/dev/null` 38 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
37 fi 39 fi
38 ;; #( 40 ;; #(
@@ -43,15 +45,14 @@ Index: libtool-2.4.2/libltdl/m4/libtool.m4
43 no|'') 45 no|'')
44 ;; #( 46 ;; #(
45 *) 47 *)
46- AC_MSG_RESULT([${with_sysroot}]) 48- AC_MSG_RESULT([$with_sysroot])
47+ AC_MSG_RESULT([${with_libtool_sysroot}]) 49+ AC_MSG_RESULT([$with_libtool_sysroot])
48 AC_MSG_ERROR([The sysroot must be an absolute path.]) 50 AC_MSG_ERROR([The sysroot must be an absolute path.])
49 ;; 51 ;;
50 esac 52 esac
51Index: libtool-2.4.2/tests/sysroot.at 53diff --git a/tests/sysroot.at b/tests/sysroot.at
52=================================================================== 54--- a/tests/sysroot.at
53--- libtool-2.4.2.orig/tests/sysroot.at 55+++ b/tests/sysroot.at
54+++ libtool-2.4.2/tests/sysroot.at
55@@ -64,7 +64,7 @@ while read file; do 56@@ -64,7 +64,7 @@ while read file; do
56 done]) 57 done])
57 58
@@ -60,7 +61,7 @@ Index: libtool-2.4.2/tests/sysroot.at
60+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" 61+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
61 62
62 #??? 63 #???
63 if test "$shlibpath_var" = PATH; then 64 if test PATH = "$shlibpath_var"; then
64@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) 65@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign])
65 AC_PROG_CC 66 AC_PROG_CC
66 AC_CONFIG_SRCDIR([lib2.c]) 67 AC_CONFIG_SRCDIR([lib2.c])
@@ -79,11 +80,10 @@ Index: libtool-2.4.2/tests/sysroot.at
79 AC_SUBST([sysroot]) 80 AC_SUBST([sysroot])
80 AC_OUTPUT(Makefile) 81 AC_OUTPUT(Makefile)
81 ]]) 82 ]])
82Index: libtool-2.4.2/tests/testsuite 83diff --git a/tests/testsuite b/tests/testsuite
83=================================================================== 84--- a/tests/testsuite
84--- libtool-2.4.2.orig/tests/testsuite 85+++ b/tests/testsuite
85+++ libtool-2.4.2/tests/testsuite 86@@ -48945,7 +48945,7 @@ $at_traceon; }
86@@ -26676,7 +26676,7 @@ $at_traceon; }
87 87
88 88
89 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" 89 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
@@ -91,8 +91,8 @@ Index: libtool-2.4.2/tests/testsuite
91+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" 91+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
92 92
93 #??? 93 #???
94 if test "$shlibpath_var" = PATH; then 94 if test PATH = "$shlibpath_var"; then
95@@ -26874,7 +26874,7 @@ AM_INIT_AUTOMAKE([foreign]) 95@@ -49154,7 +49154,7 @@ AM_INIT_AUTOMAKE([foreign])
96 AC_PROG_CC 96 AC_PROG_CC
97 AC_CONFIG_SRCDIR([lib2.c]) 97 AC_CONFIG_SRCDIR([lib2.c])
98 LT_INIT 98 LT_INIT
@@ -101,7 +101,7 @@ Index: libtool-2.4.2/tests/testsuite
101 AC_SUBST([sysroot]) 101 AC_SUBST([sysroot])
102 AC_OUTPUT(Makefile) 102 AC_OUTPUT(Makefile)
103 _ATEOF 103 _ATEOF
104@@ -27051,7 +27051,7 @@ AM_INIT_AUTOMAKE([foreign]) 104@@ -49342,7 +49342,7 @@ AM_INIT_AUTOMAKE([foreign])
105 AC_PROG_CC 105 AC_PROG_CC
106 AC_CONFIG_SRCDIR([prog.c]) 106 AC_CONFIG_SRCDIR([prog.c])
107 LT_INIT 107 LT_INIT
@@ -110,7 +110,7 @@ Index: libtool-2.4.2/tests/testsuite
110 AC_SUBST([sysroot]) 110 AC_SUBST([sysroot])
111 AC_OUTPUT(Makefile) 111 AC_OUTPUT(Makefile)
112 _ATEOF 112 _ATEOF
113@@ -27392,7 +27392,7 @@ $at_traceon; } 113@@ -49694,7 +49694,7 @@ $at_traceon; }
114 114
115 115
116 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" 116 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
@@ -118,8 +118,8 @@ Index: libtool-2.4.2/tests/testsuite
118+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" 118+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
119 119
120 #??? 120 #???
121 if test "$shlibpath_var" = PATH; then 121 if test PATH = "$shlibpath_var"; then
122@@ -27590,7 +27590,7 @@ AM_INIT_AUTOMAKE([foreign]) 122@@ -49903,7 +49903,7 @@ AM_INIT_AUTOMAKE([foreign])
123 AC_PROG_CC 123 AC_PROG_CC
124 AC_CONFIG_SRCDIR([lib2.c]) 124 AC_CONFIG_SRCDIR([lib2.c])
125 LT_INIT 125 LT_INIT
@@ -128,7 +128,7 @@ Index: libtool-2.4.2/tests/testsuite
128 AC_SUBST([sysroot]) 128 AC_SUBST([sysroot])
129 AC_OUTPUT(Makefile) 129 AC_OUTPUT(Makefile)
130 _ATEOF 130 _ATEOF
131@@ -27767,7 +27767,7 @@ AM_INIT_AUTOMAKE([foreign]) 131@@ -50091,7 +50091,7 @@ AM_INIT_AUTOMAKE([foreign])
132 AC_PROG_CC 132 AC_PROG_CC
133 AC_CONFIG_SRCDIR([prog.c]) 133 AC_CONFIG_SRCDIR([prog.c])
134 LT_INIT 134 LT_INIT
@@ -137,7 +137,7 @@ Index: libtool-2.4.2/tests/testsuite
137 AC_SUBST([sysroot]) 137 AC_SUBST([sysroot])
138 AC_OUTPUT(Makefile) 138 AC_OUTPUT(Makefile)
139 _ATEOF 139 _ATEOF
140@@ -28108,7 +28108,7 @@ $at_traceon; } 140@@ -50443,7 +50443,7 @@ $at_traceon; }
141 141
142 142
143 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" 143 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
@@ -145,8 +145,8 @@ Index: libtool-2.4.2/tests/testsuite
145+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" 145+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
146 146
147 #??? 147 #???
148 if test "$shlibpath_var" = PATH; then 148 if test PATH = "$shlibpath_var"; then
149@@ -28306,7 +28306,7 @@ AM_INIT_AUTOMAKE([foreign]) 149@@ -50652,7 +50652,7 @@ AM_INIT_AUTOMAKE([foreign])
150 AC_PROG_CC 150 AC_PROG_CC
151 AC_CONFIG_SRCDIR([lib2.c]) 151 AC_CONFIG_SRCDIR([lib2.c])
152 LT_INIT 152 LT_INIT
@@ -155,7 +155,7 @@ Index: libtool-2.4.2/tests/testsuite
155 AC_SUBST([sysroot]) 155 AC_SUBST([sysroot])
156 AC_OUTPUT(Makefile) 156 AC_OUTPUT(Makefile)
157 _ATEOF 157 _ATEOF
158@@ -28483,7 +28483,7 @@ AM_INIT_AUTOMAKE([foreign]) 158@@ -50840,7 +50840,7 @@ AM_INIT_AUTOMAKE([foreign])
159 AC_PROG_CC 159 AC_PROG_CC
160 AC_CONFIG_SRCDIR([prog.c]) 160 AC_CONFIG_SRCDIR([prog.c])
161 LT_INIT 161 LT_INIT
diff --git a/meta/recipes-devtools/libtool/libtool/respect-fstack-protector.patch b/meta/recipes-devtools/libtool/libtool/respect-fstack-protector.patch
deleted file mode 100644
index a82b2ec5a1..0000000000
--- a/meta/recipes-devtools/libtool/libtool/respect-fstack-protector.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1Source: http://permalink.gmane.org/gmane.comp.gnu.libtool.bugs/7341
2
3Bug confirmed. When code is compiled with -fstack-protector{,-all},
4GCC "emits extra code to check for buffer overflows, such as stack
5smashing attacks". This extra code uses symbols from libssp, and
6therefore (at least) Cygwin's GCC specs contain:
7
8*link_ssp:
9%{fstack-protector|fstack-protector-all:-lssp_nonshared -lssp}
10
11Therefore, when libtool fails to pass -fstack-protector{,-all} at link
12stage, the link fails.
13
14Patch attached. (Yes, I have a copyright assignment on file.)
15
16Yaakov
17Cygwin/X
18
19From b79f4e117b6f73cc461a2e232063e08481d33300 Mon Sep 17 00:00:00 2001
20From: Yaakov Selkowitz <yselkowitz <at> users.sourceforge.net>
21Date: Tue, 1 Jun 2010 22:18:51 -0500
22Subject: [PATCH] Fix linking with -fstack-protector
23
24* libltdl/config/ltmain.m4sh (func_mode_link): Pass -fstack-protector*
25to the linker as it is required at link time to resolve libssp symbols.
26
27Signed-off-by: Yaakov Selkowitz <yselkowitz <at> users.sourceforge.net>
28---
29 libltdl/config/ltmain.m4sh | 4 +++-
30 1 files changed, 3 insertions(+), 1 deletions(-)
31
32Signed-off-by: Khem Raj <raj.khem@gmail.com>
33Upstream-Status: Pending
34Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
35===================================================================
36--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh 2012-06-01 12:35:44.089638130 -0700
37+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 2012-06-01 12:37:25.789643055 -0700
38@@ -5067,13 +5067,14 @@
39 # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
40 # -F/path path to uninstalled frameworks, gcc on darwin
41 # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
42+ # -fstack-protector* stack protector flags for GCC
43 # @file GCC response files
44 # -tp=* Portland pgcc target processor selection
45 # --sysroot=* for sysroot support
46 # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
47 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
48 -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
49- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
50+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
51 func_quote_for_eval "$arg"
52 arg="$func_quote_for_eval_result"
53 func_append compile_command " $arg"
diff --git a/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/meta/recipes-devtools/libtool/libtool/trailingslash.patch
index bb7a761e25..e8824d7db9 100644
--- a/meta/recipes-devtools/libtool/libtool/trailingslash.patch
+++ b/meta/recipes-devtools/libtool/libtool/trailingslash.patch
@@ -11,11 +11,12 @@ Merged a patch received from Gary Thomas <gary@mlbassoc.com>
11Date: 2010/07/12 11Date: 2010/07/12
12Nitin A Kamble <nitin.a.kamble@intel.com> 12Nitin A Kamble <nitin.a.kamble@intel.com>
13 13
14Index: libtool-2.4.2/libltdl/config/ltmain.m4sh 14Updated by: Robert Yang <liezhi.yang@windriver.com>
15=================================================================== 15
16--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh 16diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
17+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 17--- a/build-aux/ltmain.in
18@@ -2167,8 +2167,15 @@ func_mode_install () 18+++ b/build-aux/ltmain.in
19@@ -2356,8 +2356,15 @@ func_mode_install ()
19 func_append dir "$objdir" 20 func_append dir "$objdir"
20 21
21 if test -n "$relink_command"; then 22 if test -n "$relink_command"; then
diff --git a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
index 0cd66ad524..6af99f327c 100644
--- a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
@@ -6,16 +6,16 @@ i.e. when lt_sysroot is not set, it will still behave the same and add
6-L/usr/lib to the relink command. 6-L/usr/lib to the relink command.
7 7
8-Khem Raj <raj.khem@gmail.com> 8-Khem Raj <raj.khem@gmail.com>
9Updated by: Robert Yang <liezhi.yang@windriver.com>
9 10
10Index: libtool-2.4.2/libltdl/config/ltmain.m4sh 11diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
11=================================================================== 12--- a/build-aux/ltmain.in
12--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh 13+++ b/build-aux/ltmain.in
13+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 14@@ -6421,7 +6421,7 @@ func_mode_link ()
14@@ -6138,7 +6138,7 @@ func_mode_link ()
15 fi 15 fi
16 else 16 else
17 # We cannot seem to hardcode it, guess we'll fake it. 17 # We cannot seem to hardcode it, guess we'll fake it.
18- add_dir="-L$libdir" 18- add_dir=-L$libdir
19+ add_dir="-L$lt_sysroot$libdir" 19+ add_dir="-L$lt_sysroot$libdir"
20 # Try looking first in the location we're being installed to. 20 # Try looking first in the location we're being installed to.
21 if test -n "$inst_prefix_dir"; then 21 if test -n "$inst_prefix_dir"; then
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.2.bb b/meta/recipes-devtools/libtool/libtool_2.4.4.bb
index 60643129be..45f1b2f3a9 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.4.bb
@@ -1,7 +1,5 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PR = "${INC_PR}.0"
4
5RDEPENDS_${PN} += "bash" 3RDEPENDS_${PN} += "bash"
6 4
7# 5#
@@ -23,6 +21,6 @@ do_install_append () {
23libtool_sysroot_preprocess () { 21libtool_sysroot_preprocess () {
24 rm -rf ${SYSROOT_DESTDIR}${bindir}/* 22 rm -rf ${SYSROOT_DESTDIR}${bindir}/*
25 rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/* 23 rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/*
26 rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/config/* 24 rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/build-aux/*
27} 25}
28 26
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.4.bb
index 7b5c97a97a..508eade326 100644
--- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.4.bb
@@ -1,7 +1,5 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PR = "${INC_PR}.0"
4
5FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" 3FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:"
6 4
7SRC_URI += "file://prefix.patch" 5SRC_URI += "file://prefix.patch"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 12:54:44 +0000