summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-09-20 00:43:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 09:53:08 +0100
commit9baffc1f2a0712d73506bef198e0679622e461bd (patch)
treef4358dd622fa16e63c561f50721034aa0c4d52a6 /meta/recipes-devtools/libtool
parentba1e0eef99e3f4349b9d524b1cc643c67bc226c5 (diff)
downloadpoky-9baffc1f2a0712d73506bef198e0679622e461bd.tar.gz
libtool: Fix nios2 support
Add patch to fix excessive greediness of OS/2 check in libtool. (From OE-Core rev: 1bd71e740b085d2e012b38ac5c04556d7f8561c4) Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool')
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.6.inc1
-rw-r--r--meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch68
2 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index a977c73703..de06ccb251 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
19 file://fix-resolve-lt-sysroot.patch \ 19 file://fix-resolve-lt-sysroot.patch \
20 file://nohardcodepaths.patch \ 20 file://nohardcodepaths.patch \
21 file://unwind-opt-parsing.patch \ 21 file://unwind-opt-parsing.patch \
22 file://0001-libtool-Fix-support-for-NIOS2-processor.patch \
22 " 23 "
23 24
24SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" 25SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e"
diff --git a/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch b/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
new file mode 100644
index 0000000000..bbd36d8dc1
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
@@ -0,0 +1,68 @@
1From df2cd898e48208f26320d40c3ed6b19c75c27142 Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de>
3Date: Thu, 17 Sep 2015 00:43:15 +0200
4Subject: [PATCH] libtool: Fix support for NIOS2 processor
5
6The name of the system contains the string "nios2". This string
7is caught by the some of the greedy checks for OS/2 in libtool,
8in particular the *os2* branches of switch statements match for
9the nios2 string, which results in incorrect behavior of libtool.
10
11This patch adds an explicit check for *nios2* before the *os2*
12checks to prevent the OS/2 check incorrectly trapping the nios2
13as well.
14
15Signed-off-by: Marek Vasut <marex@denx.de>
16Upstream-Status: Submitted
17---
18 build-aux/ltmain.in | 20 ++++++++++++++++++++
19 1 file changed, 20 insertions(+)
20
21diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
22index d5cf07a..4164284 100644
23--- a/build-aux/ltmain.in
24+++ b/build-aux/ltmain.in
25@@ -504,6 +504,12 @@ libtool_validate_options ()
26 test : = "$debug_cmd" || func_append preserve_args " --debug"
27
28 case $host in
29+ # For NIOS2, we want to make sure that it's not caught by the
30+ # more general OS/2 check below. Otherwise, NIOS2 is the same
31+ # as the default option.
32+ *nios2*)
33+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
34+ ;;
35 # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
36 # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
37 *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
38@@ -6220,6 +6226,15 @@ func_mode_link ()
39 if test -n "$library_names" &&
40 { test no = "$use_static_libs" || test -z "$old_library"; }; then
41 case $host in
42+ *nios2*)
43+ # For NIOS2, we want to make sure that it's not caught by the
44+ # more general OS/2 check below. Otherwise, NIOS2 is the same
45+ # as the default option.
46+ if test no = "$installed"; then
47+ func_append notinst_deplibs " $lib"
48+ need_relink=yes
49+ fi
50+ ;;
51 *cygwin* | *mingw* | *cegcc* | *os2*)
52 # No point in relinking DLLs because paths are not encoded
53 func_append notinst_deplibs " $lib"
54@@ -6290,6 +6305,11 @@ func_mode_link ()
55 elif test -n "$soname_spec"; then
56 # bleh windows
57 case $host in
58+ *nios2*)
59+ # For NIOS2, we want to make sure that it's not caught by the
60+ # more general OS/2 check below. Otherwise, NIOS2 is the same
61+ # as the default option.
62+ ;;
63 *cygwin* | mingw* | *cegcc* | *os2*)
64 func_arith $current - $age
65 major=$func_arith_result
66--
672.5.1
68