1 From f82d0f1b47ea7ae0d20c00b4f29cfd694ab66a07 Mon Sep 17 00:00:00 2001 2 From: David 'Digit' Turner <digit (a] google.com> 3 Date: Tue, 21 Feb 2012 15:07:59 +0100 4 Subject: Disable libstdc++ versioning 5 6 This patch ensure that the generated library is called libgnustl_shared.so 7 instead of libstdc++.so.3 (or some similar number-versioned name). 8 9 Change-Id: I63fb5be818115c6d0c7e96b937ba39f225b475cf 10 --- 11 gcc-4.4.3/libstdc++-v3/src/Makefile.am | 2 +- 12 gcc-4.4.3/libstdc++-v3/src/Makefile.in | 7 +++++-- 13 gcc-4.6/libstdc++-v3/src/Makefile.am | 2 +- 14 gcc-4.6/libstdc++-v3/src/Makefile.in | 7 +++++-- 15 4 files changed, 12 insertions(+), 6 deletions(-) 16 17 diff --git a/gcc-4.4.3/libstdc++-v3/src/Makefile.in b/gcc-4.4.3/libstdc++-v3/src/Makefile.in 18 index 74bbdd4..f08bf34 100644 19 --- a/gcc-4.4.3/libstdc++-v3/src/Makefile.in 20 +++ b/gcc-4.4.3/libstdc++-v3/src/Makefile.in 21 @@ -350,7 +350,7 @@ WARN_CXXFLAGS = \ 22 AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 23 24 # Cross compiler support. 25 -toolexeclib_LTLIBRARIES = libstdc++.la 26 +toolexeclib_LTLIBRARIES = libgnustl_shared.la 27 @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist 28 @ENABLE_SYMVERS_FALSE@version_arg = 29 @ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,--version-script=libstdc++-symbols.ver 30 @@ -576,6 +576,9 @@ clean-toolexeclibLTLIBRARIES: 31 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 32 $(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 33 34 +libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 35 + $(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 36 + 37 mostlyclean-compile: 38 -rm -f *.$(OBJEXT) 39 40 diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.in b/gcc-4.6/libstdc++-v3/src/Makefile.in 41 index 146ec3f..99f0f56 100644 42 --- a/gcc-4.6/libstdc++-v3/src/Makefile.in 43 +++ b/gcc-4.6/libstdc++-v3/src/Makefile.in 44 @@ -340,7 +340,7 @@ WARN_CXXFLAGS = \ 45 AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 46 47 # Cross compiler support. 48 -toolexeclib_LTLIBRARIES = libstdc++.la 49 +toolexeclib_LTLIBRARIES = libgnustl_shared.la 50 @ENABLE_SYMVERS_TRUE@CLEANFILES = libstdc++-symbols.ver $(version_dep) 51 @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist 52 @ENABLE_SYMVERS_FALSE@version_arg = 53 @@ -596,6 +596,9 @@ clean-toolexeclibLTLIBRARIES: 54 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 55 $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 56 57 +libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 58 + $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 59 + 60 mostlyclean-compile: 61 -rm -f *.$(OBJEXT) 62 63 diff --git a/gcc-4.7/libstdc++-v3/src/Makefile.in b/gcc-4.7/libstdc++-v3/src/Makefile.in 64 index b10d853..3669b06 100644 65 --- a/gcc-4.7/libstdc++-v3/src/Makefile.in 66 +++ b/gcc-4.7/libstdc++-v3/src/Makefile.in 67 @@ -332,7 +332,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 68 SUBDIRS = c++98 c++11 69 70 # Cross compiler support. 71 -toolexeclib_LTLIBRARIES = libstdc++.la 72 +toolexeclib_LTLIBRARIES = libgnustl_shared.la 73 @GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources = 74 @GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc 75 @ENABLE_PARALLEL_FALSE@parallel_compat_sources = 76 @@ -515,6 +515,9 @@ clean-toolexeclibLTLIBRARIES: 77 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 78 $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 79 80 +libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 81 + $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 82 + 83 mostlyclean-compile: 84 -rm -f *.$(OBJEXT) 85 86 -- 87 1.7.6.rc0 88 89
