From 4a0927423d51f594b870e58b3eb51574327f8b0e Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Tue, 23 Oct 2012 19:40:57 +0800 Subject: Disable libstdc versioning Used to be first half of NDK local patch at $NDK/build/tools/ toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch Change-Id: I8ac0f14d20f32a4f946ffd6fd5756a2ab556e99b --- gcc-4.4.3/libstdc++-v3/src/Makefile.am | 2 +- gcc-4.4.3/libstdc++-v3/src/Makefile.in | 2 +- gcc-4.6/libstdc++-v3/src/Makefile.am | 2 +- gcc-4.6/libstdc++-v3/src/Makefile.in | 2 +- gcc-4.7/libstdc++-v3/src/Makefile.am | 2 +- gcc-4.7/libstdc++-v3/src/Makefile.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc-4.4.3/libstdc++-v3/src/Makefile.am b/gcc-4.4.3/libstdc++-v3/src/Makefile.am index 187e38ec3..ff586f20a 100644 --- a/gcc-4.4.3/libstdc++-v3/src/Makefile.am +++ b/gcc-4.4.3/libstdc++-v3/src/Makefile.am @@ -206,7 +206,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/libsupc++/libsupc++convenience.la libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm + -avoid-version ${version_arg} -lm # Use special rules for the deprecated source files so that they find # deprecated include files. diff --git a/gcc-4.4.3/libstdc++-v3/src/Makefile.in b/gcc-4.4.3/libstdc++-v3/src/Makefile.in index 74bbdd4ae..c84921e53 100644 --- a/gcc-4.4.3/libstdc++-v3/src/Makefile.in +++ b/gcc-4.4.3/libstdc++-v3/src/Makefile.in @@ -454,7 +454,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/libsupc++/libsupc++convenience.la libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm + -avoid-version ${version_arg} -lm # Use special rules for the deprecated source files so that they find diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.am b/gcc-4.6/libstdc++-v3/src/Makefile.am index 43488ceb9..680a17251 100644 --- a/gcc-4.6/libstdc++-v3/src/Makefile.am +++ b/gcc-4.6/libstdc++-v3/src/Makefile.am @@ -251,7 +251,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/libsupc++/libsupc++convenience.la libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm + -avoid-version ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) diff --git a/gcc-4.6/libstdc++-v3/src/Makefile.in b/gcc-4.6/libstdc++-v3/src/Makefile.in index 146ec3f12..d03acd557 100644 --- a/gcc-4.6/libstdc++-v3/src/Makefile.in +++ b/gcc-4.6/libstdc++-v3/src/Makefile.in @@ -466,7 +466,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/libsupc++/libsupc++convenience.la libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm + -avoid-version ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) diff --git a/gcc-4.7/libstdc++-v3/src/Makefile.am b/gcc-4.7/libstdc++-v3/src/Makefile.am index a1eb04dab..ee328e478 100644 --- a/gcc-4.7/libstdc++-v3/src/Makefile.am +++ b/gcc-4.7/libstdc++-v3/src/Makefile.am @@ -74,7 +74,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++11/libc++11convenience.la libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm + -avoid-version ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) diff --git a/gcc-4.7/libstdc++-v3/src/Makefile.in b/gcc-4.7/libstdc++-v3/src/Makefile.in index b10d853af..a88701fc9 100644 --- a/gcc-4.7/libstdc++-v3/src/Makefile.in +++ b/gcc-4.7/libstdc++-v3/src/Makefile.in @@ -367,7 +367,7 @@ libstdc___la_DEPENDENCIES = \ $(top_builddir)/src/c++11/libc++11convenience.la libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm + -avoid-version ${version_arg} -lm libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) -- cgit v1.2.3