OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

acinclude.m4 (GLIBCXX_CONFIGURE): Delete gcc_version logic.

Browse Source 
* acinclude.m4 (GLIBCXX_CONFIGURE): Delete gcc_version logic.
	(GLIBCXX_EXPORT_INSTALL_INFO): Adjust quotation so ${gcc_version}
	is expanded by the Makefiles, not by configure.
	* fragment.am: Set gcc_version.
	* libmath/Makefile.am: Likewise.
	* configure, Makefile.in, include/Makefile.in, libmath/Makefile.in
	* libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in
	* testsuite/Makefile.in: Regenerate.

From-SVN: r96814
This commit is contained in:
Zack Weinberg 2005-03-21 17:40:24 +00:00
parent af5d3a18b5
commit 47194af45f
12 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,14 @@
2005-03-21 Zack Weinberg <zack@codesourcery.com>
* acinclude.m4 (GLIBCXX_CONFIGURE): Delete gcc_version logic.
(GLIBCXX_EXPORT_INSTALL_INFO): Adjust quotation so ${gcc_version}
is expanded by the Makefiles, not by configure.
* fragment.am: Set gcc_version.
* libmath/Makefile.am: Likewise.
* configure, Makefile.in, include/Makefile.in, libmath/Makefile.in
* libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in
* testsuite/Makefile.in: Regenerate.
2005-03-16 Paolo Carlini <pcarlini@suse.de>
* testsuite/20_util/functional/binders.cc: Remove explicit
@ -64,7 +75,7 @@
* testsuite/23_containers/vector/cons/1.cc: Likewise.
* testsuite/23_containers/vector/cons/2.cc: Likewise.
* testsuite/23_containers/vector/cons/3.cc: Likewise.
* testsuite/23_containers/vector/cons/6513.cc: Likewise.
* testsuite/23_containers/vector/cons/6513.cc: Likewise.
* testsuite/23_containers/vector/element_access/1.cc: Likewise.
* testsuite/23_containers/vector/invalidation/1.cc: Likewise.
* testsuite/23_containers/vector/invalidation/2.cc: Likewise.
@ -72,7 +83,7 @@
* testsuite/23_containers/vector/invalidation/4.cc: Likewise.
* testsuite/23_containers/vector/modifiers/1.cc: Likewise.
* testsuite/23_containers/vector/modifiers/2.cc: Likewise.
* testsuite/23_containers/vector/modifiers/swap.cc: Likewise.
* testsuite/23_containers/vector/modifiers/swap.cc: Likewise.
* testsuite/23_containers/vector/resize/1.cc: Likewise.
* testsuite/24_iterators/back_insert_iterator.cc: Likewise.
* testsuite/24_iterators/front_insert_iterator.cc: Likewise.
@ -81,7 +92,7 @@
* testsuite/25_algorithms/copy/1.cc: Likewise.
* testsuite/25_algorithms/copy/2.cc: Likewise.
* testsuite/25_algorithms/copy/3.cc: Likewise.
* testsuite/25_algorithms/copy/4.cc: Likewise.
* testsuite/25_algorithms/copy/4.cc: Likewise.
* testsuite/25_algorithms/equal.cc: Likewise.
* testsuite/25_algorithms/fill/1.cc: Likewise.
* testsuite/25_algorithms/fill/2.cc: Likewise.

3
libstdc++-v3/Makefile.in
View File

@ -252,6 +252,9 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}

12
libstdc++-v3/acinclude.m4
View File

@ -32,7 +32,6 @@ dnl Initialize the rest of the library configury. At this point we have
dnl variables like $host.
dnl
dnl Sets:
dnl gcc_version (x.y.z format)
dnl SUBDIRS
dnl Substs:
dnl glibcxx_builddir (absolute path)
@ -109,11 +108,6 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [
AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
# For directory versioning (e.g., headers) and other variables.
AC_MSG_CHECKING([for GCC version number])
gcc_version=`$CXX -dumpversion`
AC_MSG_RESULT($gcc_version)
# Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't
# available). Uncomment the next line to force a particular method.
AC_PROG_LN_S
@ -752,7 +746,7 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
# Default case for install directory for include files.
if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='${prefix}'/include/c++/${gcc_version}
gxx_include_dir='${prefix}/include/c++/${gcc_version}'
fi
# Version-specific runtime libs processing.
@ -762,10 +756,10 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
# is selected. FIXME: these variables are misnamed, there are
# no executables installed in _toolexecdir or _toolexeclibdir.
if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
fi
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
fi
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir

17
libstdc++-v3/configure vendored
View File

@ -3353,13 +3353,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# For directory versioning (e.g., headers) and other variables.
echo "$as_me:$LINENO: checking for GCC version number" >&5
echo $ECHO_N "checking for GCC version number... $ECHO_C" >&6
gcc_version=`$CXX -dumpversion`
echo "$as_me:$LINENO: result: $gcc_version" >&5
echo "${ECHO_T}$gcc_version" >&6
# Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't
# available). Uncomment the next line to force a particular method.
echo "$as_me:$LINENO: checking whether ln -s works" >&5
@ -4390,7 +4383,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 4393 "configure"' > conftest.$ac_ext
echo '#line 4386 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -5011,7 +5004,7 @@ fi;
#
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
cat > conftest.$ac_ext << EOF
#line 5014 "configure"
#line 5007 "configure"
struct S { ~S(); };
void bar();
void foo()
@ -99295,7 +99288,7 @@ echo "${ECHO_T}$version_specific_libs" >&6
# Default case for install directory for include files.
if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='${prefix}'/include/c++/${gcc_version}
gxx_include_dir='${prefix}/include/c++/${gcc_version}'
fi
# Version-specific runtime libs processing.
@ -99305,10 +99298,10 @@ echo "${ECHO_T}$version_specific_libs" >&6
# is selected. FIXME: these variables are misnamed, there are
# no executables installed in _toolexecdir or _toolexeclibdir.
if test x"$gxx_include_dir" = x"no"; then
gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
gxx_include_dir='${libdir}/gcc/${host_alias}/${gcc_version}/include/c++'
fi
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
glibcxx_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
fi
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir

3
libstdc++-v3/fragment.am
View File

@ -1,6 +1,9 @@
## This is used in all Makefile.am's except for libmath's. Set defaults here.
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs

3
libstdc++-v3/include/Makefile.in
View File

@ -219,6 +219,9 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}

3
libstdc++-v3/libmath/Makefile.am
View File

@ -22,6 +22,9 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la

3
libstdc++-v3/libmath/Makefile.in
View File

@ -238,6 +238,9 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
noinst_LTLIBRARIES = libmath.la
libmath_la_LIBADD = $(LIBMATHOBJS)

3
libstdc++-v3/libsupc++/Makefile.in
View File

@ -275,6 +275,9 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}

3
libstdc++-v3/po/Makefile.in
View File

@ -219,6 +219,9 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}

3
libstdc++-v3/src/Makefile.in
View File

@ -254,6 +254,9 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}

3
libstdc++-v3/testsuite/Makefile.in
View File

@ -249,6 +249,9 @@ target_os = @target_os@
target_vendor = @target_vendor@
toplevel_srcdir = @toplevel_srcdir@
AUTOMAKE_OPTIONS = dejagnu nostdinc
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}