Here is a patch that updates libgo to use gcc's internal libtool
version.  I've only retained config/go.m4 for now.

http://trippelsdorf.de/Use-gcc-s-libtool-in-libgo.patch.bz2

---
 libgo/Makefile.in           |    9 +-
 libgo/aclocal.m4            |   10 +-
 libgo/config/libtool.m4     | 7516 -------------------------------------
 libgo/config/ltmain.sh      | 8636 -------------------------------------------
 libgo/config/ltoptions.m4   |  369 --
 libgo/config/ltsugar.m4     |  123 -
 libgo/config/ltversion.m4   |   23 -
 libgo/config/lt~obsolete.m4 |   98 -
 libgo/configure             | 1747 +++++++---
 libgo/testsuite/Makefile.in |    9 +-
 10 files changed, 1276 insertions(+), 17264 deletions(-)
 delete mode 100644 libgo/config/libtool.m4
 delete mode 100644 libgo/config/ltmain.sh
 delete mode 100644 libgo/config/ltoptions.m4
 delete mode 100644 libgo/config/ltsugar.m4
 delete mode 100644 libgo/config/ltversion.m4
 delete mode 100644 libgo/config/lt~obsolete.m4

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 05223a6..bad8ed3 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -58,11 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/../config/multi.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../config/unwind_ipinfo.m4 \
-       $(top_srcdir)/config/go.m4 $(top_srcdir)/config/libtool.m4 \
-       $(top_srcdir)/config/ltoptions.m4 \
-       $(top_srcdir)/config/ltsugar.m4 \
-       $(top_srcdir)/config/ltversion.m4 \
-       $(top_srcdir)/config/lt~obsolete.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/config/go.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -365,6 +361,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -399,6 +396,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIBS = @MATH_LIBS@
 MKDIR_P = @MKDIR_P@
 NET_LIBS = @NET_LIBS@
@@ -434,6 +432,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff --git a/libgo/aclocal.m4 b/libgo/aclocal.m4
index ca453c6..9d4f58c 100644
--- a/libgo/aclocal.m4
+++ b/libgo/aclocal.m4
@@ -973,9 +973,9 @@ m4_include([../config/lead-dot.m4])
 m4_include([../config/multi.m4])
 m4_include([../config/override.m4])
 m4_include([../config/unwind_ipinfo.m4])
+m4_include([../config/libtool.m4])
+m4_include([../config/ltoptions.m4])
+m4_include([../config/ltsugar.m4])
+m4_include([../config/ltversion.m4])
+m4_include([../config/lt~obsolete.m4])
 m4_include([config/go.m4])
-m4_include([config/libtool.m4])
-m4_include([config/ltoptions.m4])
-m4_include([config/ltsugar.m4])
-m4_include([config/ltversion.m4])
-m4_include([config/lt~obsolete.m4])
diff --git a/libgo/config/libtool.m4 b/libgo/config/libtool.m4
deleted file mode 100644
index 1a667d3..0000000
--- a/libgo/config/libtool.m4
+++ /dev/null
...

-- 
Markus

Reply via email to