mirror of
https://git.yoctoproject.org/poky
synced 2026-05-05 07:39:49 +02:00
libtool: Upgrade from 2.4 -> 2.4.2
Rebased patches to the newer source code and deleted resolve-sysroot.patch
since its already applied upstream
merged libtool-2.4.2.inc & libtool.inc files
replaced PR with ${INC_PR}.0
(From OE-Core rev: aa0cb889a4ef883235dc3f3e1d76ee4a556ae03a)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
177b2e337a
commit
d8bee043cb
@@ -18,10 +18,10 @@ the simplest fix is just to remove $SHELL.
|
||||
Updated: Date: 2011/11/09
|
||||
RP
|
||||
|
||||
Index: libtool-2.4/libltdl/m4/libtool.m4
|
||||
Index: libtool-2.4.2/libltdl/m4/libtool.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.orig/libltdl/m4/libtool.m4
|
||||
+++ libtool-2.4/libltdl/m4/libtool.m4
|
||||
--- libtool-2.4.2.orig/libltdl/m4/libtool.m4
|
||||
+++ libtool-2.4.2/libltdl/m4/libtool.m4
|
||||
@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
|
||||
@@ -32,7 +32,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
|
||||
AC_SUBST(LIBTOOL)dnl
|
||||
|
||||
_LT_SETUP
|
||||
@@ -204,7 +205,7 @@ aix3*)
|
||||
@@ -206,7 +207,7 @@ aix3*)
|
||||
esac
|
||||
|
||||
# Global variables:
|
||||
@@ -41,10 +41,10 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
|
||||
can_build_shared=yes
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
Index: libtool-2.4/Makefile.am
|
||||
Index: libtool-2.4.2/Makefile.am
|
||||
===================================================================
|
||||
--- libtool-2.4.orig/Makefile.am
|
||||
+++ libtool-2.4/Makefile.am
|
||||
--- libtool-2.4.2.orig/Makefile.am
|
||||
+++ libtool-2.4.2/Makefile.am
|
||||
@@ -31,7 +31,7 @@ AM_LDFLAGS =
|
||||
DIST_SUBDIRS = .
|
||||
EXTRA_DIST =
|
||||
@@ -54,8 +54,17 @@ Index: libtool-2.4/Makefile.am
|
||||
|
||||
CLEANFILES =
|
||||
MOSTLYCLEANFILES =
|
||||
@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre
|
||||
## ---------------- ##
|
||||
@@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
|
||||
ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
|
||||
ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
|
||||
ChangeLog.2008 ChangeLog.2009 ChangeLog.2010
|
||||
-CLEANFILES += libtool libtoolize libtoolize.tmp \
|
||||
+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
|
||||
$(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
|
||||
|
||||
## These are the replacements that need to be made at bootstrap time,
|
||||
@@ -231,7 +231,7 @@ configure_edit = sed \
|
||||
-e 's,@SED\@,$(SED),g'
|
||||
|
||||
# The libtool distributor and the standalone libtool script.
|
||||
-bin_SCRIPTS = libtoolize libtool
|
||||
@@ -63,7 +72,7 @@ Index: libtool-2.4/Makefile.am
|
||||
|
||||
libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
|
||||
rm -f libtoolize.tmp libtoolize
|
||||
@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib
|
||||
@@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to
|
||||
# We used to do this with a 'stamp-vcl' file, but non-gmake builds
|
||||
# would rerun configure on every invocation, so now we manually
|
||||
# check the version numbers from the build rule when necessary.
|
||||
@@ -74,7 +83,7 @@ Index: libtool-2.4/Makefile.am
|
||||
if test -f "$$target"; then \
|
||||
set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
|
||||
test "$$actualver" = "$$correctver" && rebuild=false; \
|
||||
@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $
|
||||
@@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $
|
||||
case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
|
||||
done; \
|
||||
if $$rebuild; then \
|
||||
@@ -85,16 +94,7 @@ Index: libtool-2.4/Makefile.am
|
||||
fi
|
||||
|
||||
.PHONY: configure-subdirs
|
||||
@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
|
||||
ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
|
||||
ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
|
||||
ChangeLog.2008 ChangeLog.2009
|
||||
-CLEANFILES += libtool libtoolize libtoolize.tmp \
|
||||
+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
|
||||
$(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
|
||||
|
||||
## We build ltversion.m4 here, instead of from config.status,
|
||||
@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
|
||||
@@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
|
||||
|
||||
BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
|
||||
LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
|
||||
|
||||
Reference in New Issue
Block a user