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: Rename libstdc++.so to libgnustl_shared.so 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.6/libstdc++-v3/src/Makefile.in | 5 ++++- 12 gcc-4.8/libstdc++-v3/src/Makefile.in | 5 ++++- 13 gcc-4.9/libstdc++-v3/src/Makefile.in | 5 ++++- 14 3 files changed, 12 insertions(+), 3 deletions(-) 15 16 diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.in b/gcc-4.6/libstdc++-v3/src/Makefile.in 17 index d03acd5..5abd1d2 100644 18 --- a/gcc-4.6/libstdc++-v3/src/Makefile.in 19 +++ b/gcc-4.6/libstdc++-v3/src/Makefile.in 20 @@ -340,7 +340,7 @@ WARN_CXXFLAGS = \ 21 AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 22 23 # Cross compiler support. 24 -toolexeclib_LTLIBRARIES = libstdc++.la 25 +toolexeclib_LTLIBRARIES = libgnustl_shared.la 26 @ENABLE_SYMVERS_TRUE@CLEANFILES = libstdc++-symbols.ver $(version_dep) 27 @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist 28 @ENABLE_SYMVERS_FALSE@version_arg = 29 @@ -596,6 +596,9 @@ clean-toolexeclibLTLIBRARIES: 30 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 31 $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 32 33 +libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 34 + $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 35 + 36 mostlyclean-compile: 37 -rm -f *.$(OBJEXT) 38 39 diff --git a/gcc-4.8/libstdc++-v3/src/Makefile.in b/gcc-4.8/libstdc++-v3/src/Makefile.in 40 index 9721ebb..dd3d426 100644 41 --- a/gcc-4.8/libstdc++-v3/src/Makefile.in 42 +++ b/gcc-4.8/libstdc++-v3/src/Makefile.in 43 @@ -336,7 +336,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 44 SUBDIRS = c++98 c++11 45 46 # Cross compiler support. 47 -toolexeclib_LTLIBRARIES = libstdc++.la 48 +toolexeclib_LTLIBRARIES = libgnustl_shared.la 49 @GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources = 50 @GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc 51 parallel_compat_sources = \ 52 @@ -544,6 +544,9 @@ clean-toolexeclibLTLIBRARIES: 53 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 54 $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 55 56 +libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 57 + $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 58 + 59 mostlyclean-compile: 60 -rm -f *.$(OBJEXT) 61 62 diff --git a/gcc-4.9/libstdc++-v3/src/Makefile.in b/gcc-4.9/libstdc++-v3/src/Makefile.in 63 index cd3943b..ec04005 100644 64 --- a/gcc-4.9/libstdc++-v3/src/Makefile.in 65 +++ b/gcc-4.9/libstdc++-v3/src/Makefile.in 66 @@ -342,7 +342,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) 67 SUBDIRS = c++98 c++11 68 69 # Cross compiler support. 70 -toolexeclib_LTLIBRARIES = libstdc++.la 71 +toolexeclib_LTLIBRARIES = libgnustl_shared.la 72 @GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources = 73 @GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc 74 parallel_compat_sources = \ 75 @@ -552,6 +552,9 @@ clean-toolexeclibLTLIBRARIES: 76 libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 77 $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 78 79 +libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 80 + $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS) 81 + 82 mostlyclean-compile: 83 -rm -f *.$(OBJEXT) 84 85 -- 86 1.9.1.423.g4596e3a 87 88
