Here are the GCC patches needed in advance of updating libtool. They
have been tested with and without the new libtool in place. This patch
does *not* include the new libtool itself. These changes were approved
by Paolo and I will check them in shortly. I will be checking in the
src tree changes too.
Steve Ellcey
sje@cup.hp.com
Top level GCC tree ChangeLog:
2007-04-14 Steve Ellcey <sje@cup.hp.com>
* config-ml.in: Pass ${ml_config_env} to configure calls.
libgfortran/ChangeLog:
2007-04-14 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS. Add libgfortran_la_LINK.
* Makefile.in: Regenerate.
libgomp/ChangeLog:
2007-04-14 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS.
* Makefile.in: Regenerate.
zlib/ChangeLog:
2007-04-14 Steve Ellcey <sje@cup.hp.com>
* Makefile.am: Add -I .. to ACLOCAL_AMFLAGS.
* Makefile.in: Regenerate.
libstdc++-v3/ChangeLog:
2007-04-14 Steve Ellcey <sje@cup.hp.com>
* configure.ac: Change how LIBSUPCXX_PICFLAGS is set.
* configure: Regenerate.
Index: config-ml.in
===================================================================
--- config-ml.in (revision 123791)
+++ config-ml.in (working copy)
@@ -108,6 +108,11 @@ ml_realsrcdir=${srcdir}
ml_verbose=--verbose
for option in ${ac_configure_args}
do
+ # strip single quotes surrounding individual options
+ case $option in
+ \'*\') eval option=$option ;;
+ esac
+
case $option in
--*) ;;
-*) option=-$option ;;
@@ -890,7 +895,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
- ${ac_configure_args} ${ml_srcdiroption} ; then
+ ${ac_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then
true
else
exit 1
Index: libgfortran/Makefile.am
===================================================================
--- libgfortran/Makefile.am (revision 123791)
+++ libgfortran/Makefile.am (working copy)
@@ -1,12 +1,13 @@
## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config
## May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
toolexeclib_LTLIBRARIES = libgfortran.la
+libgfortran_la_LINK = $(LINK)
libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran)
myexeclib_LTLIBRARIES = libgfortranbegin.la
Index: libgomp/Makefile.am
===================================================================
--- libgomp/Makefile.am (revision 123791)
+++ libgomp/Makefile.am (working copy)
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config
SUBDIRS = testsuite
## May be used by toolexeclibdir.
Index: zlib/Makefile.am
===================================================================
--- zlib/Makefile.am (revision 123791)
+++ zlib/Makefile.am (working copy)
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.8 cygnus
-ACLOCAL_AMFLAGS = -I ../config
+ACLOCAL_AMFLAGS = -I .. -I ../config
ZLIB_SOURCES = adler32.c compress.c crc32.c crc32.h deflate.c \
deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c \
Index: libstdc++-v3/configure.ac
===================================================================
--- libstdc++-v3/configure.ac (revision 123791)
+++ libstdc++-v3/configure.ac (working copy)
@@ -355,10 +355,8 @@ GLIBCXX_EXPORT_INSTALL_INFO
GLIBCXX_EXPORT_INCLUDES
GLIBCXX_EXPORT_FLAGS
-if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features |
- grep "enable shared" > /dev/null;
-then
- LIBSUPCXX_PICFLAGS=-prefer-pic
+if test "$enable_shared" = yes; then
+ LIBSUPCXX_PICFLAGS="-prefer-pic"