mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
binutils: don't expect libtool to be host-prefixed
We update the libtool m4 files in binutils with the latest files from our patched libtool so that we can use the --with-libtool-sysroot option. Remove the chunks that are specific to the libtool renaming, which now doesn't happen. (From OE-Core rev: 30baaf6c20a2e1619439cf3eb8d9ce7cb877d2fa) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ebf34d5b25
commit
be8fe788e2
@@ -796,25 +796,6 @@ index daa51244369..79d0c4b4623 100755
|
||||
cat > conftest.c << _LT_EOF
|
||||
int main() { return 0;}
|
||||
_LT_EOF
|
||||
@@ -7706,7 +8201,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -7795,7 +8291,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -8093,8 +8589,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
@@ -2757,25 +2738,6 @@ index bf6461dab1e..8e6f6d30b4d 100755
|
||||
cat > conftest.c << _LT_EOF
|
||||
int main() { return 0;}
|
||||
_LT_EOF
|
||||
@@ -7593,7 +8088,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -7682,7 +8178,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -7980,8 +8476,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
@@ -4696,25 +4658,6 @@ index 789d1b38b33..7ac563a13ad 100755
|
||||
cat > conftest.c << _LT_EOF
|
||||
int main() { return 0;}
|
||||
_LT_EOF
|
||||
@@ -7318,7 +7813,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -7407,7 +7903,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -7705,8 +8201,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
@@ -6638,25 +6581,6 @@ index 5703bba4462..e1ac86ec797 100755
|
||||
cat > conftest.c << _LT_EOF
|
||||
int main() { return 0;}
|
||||
_LT_EOF
|
||||
@@ -7220,7 +7715,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -7309,7 +7805,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -7607,8 +8103,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
@@ -8597,25 +8521,6 @@ index 2aeb3317b65..5ef46d31558 100755
|
||||
|
||||
|
||||
# Set options
|
||||
@@ -8077,7 +8582,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -8166,7 +8672,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -8464,8 +8970,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
@@ -11220,25 +11125,6 @@ index 82bcf13a606..a7fb723a145 100755
|
||||
cat > conftest.c << _LT_EOF
|
||||
int main() { return 0;}
|
||||
_LT_EOF
|
||||
@@ -8248,7 +8742,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -8337,7 +8832,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -8635,8 +9130,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
@@ -12422,16 +12308,6 @@ index 9a13f3b117a..5be47564443 100644
|
||||
|
||||
|
||||
# LT_PREREQ(VERSION)
|
||||
@@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
AC_SUBST(LIBTOOL)dnl
|
||||
|
||||
_LT_SETUP
|
||||
@@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
|
||||
dnl
|
||||
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
||||
@@ -12446,15 +12322,6 @@ index 9a13f3b117a..5be47564443 100644
|
||||
|
||||
_LT_CONFIG_LIBTOOL_INIT([
|
||||
# See if we are running on zsh, and set the options which allow our
|
||||
@@ -199,7 +205,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
|
||||
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
|
||||
configured by $[0], generated by m4_PACKAGE_STRING.
|
||||
@@ -20267,25 +20134,6 @@ index 3513e408ce1..133948631e9 100755
|
||||
cat > conftest.c << _LT_EOF
|
||||
int main() { return 0;}
|
||||
_LT_EOF
|
||||
@@ -7470,7 +7965,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -7559,7 +8055,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -7857,8 +8353,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
@@ -22209,25 +22057,6 @@ index 695819cd54b..14b5f28013a 100755
|
||||
cat > conftest.c << _LT_EOF
|
||||
int main() { return 0;}
|
||||
_LT_EOF
|
||||
@@ -7300,7 +7795,8 @@ fi
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+LIBTOOL='$(SHELL) $(top_builddir)'
|
||||
+LIBTOOL="$LIBTOOL/${host_alias}-libtool"
|
||||
|
||||
|
||||
|
||||
@@ -7389,7 +7885,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
-ofile=libtool
|
||||
+ofile=${host_alias}-libtool
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
@@ -7687,8 +8183,6 @@ fi
|
||||
lt_prog_compiler_pic=
|
||||
lt_prog_compiler_static=
|
||||
|
||||
Reference in New Issue
Block a user