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