From: Paweł Sikora <pluto@pld-linux.org>
Date: Sun, 25 Mar 2012 15:16:49 +0000 (+0000)
Subject: - libstdc++ accepts --enable-symvers=style but other libs accept only yes/no
X-Git-Tag: auto/th/gcc-4_7_0-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgcc.git;a=commitdiff_plain;h=8995433b50f72a441175076ccec61894014de9fd

- libstdc++ accepts --enable-symvers=style but other libs accept only yes/no
  and report error or silently disable plain gnu versioning.
  for now change the default libstdc++ versioning style and don't touch anything else.

Changed files:
    gcc-libjava-symvers.patch -> 1.2
    gcc-symvers.patch -> 1.1
    gcc.spec -> 1.689
---

diff --git a/gcc-libjava-symvers.patch b/gcc-libjava-symvers.patch
deleted file mode 100644
index 7e091ad..0000000
--- a/gcc-libjava-symvers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libjava/configure.ac.orig	2012-03-24 09:51:34.000000000 +0100
-+++ libjava/configure.ac	2012-03-24 11:44:40.819510707 +0100
-@@ -1833,6 +1833,7 @@
- 		    [disable symbol versioning for libjava]),
-        [case "$enableval" in
-          yes) libjava_cv_anon_version_script=yes ;;
-+         gnu*) libjava_cv_anon_version_script=yes ;;
-          no)  libjava_cv_anon_version_script=no ;;
-          *)   AC_MSG_ERROR([Unknown argument to enable/disable symvers]);;
-         esac],
---- libjava/configure.orig	2012-03-24 21:48:30.000000000 +0100
-+++ libjava/configure	2012-03-24 22:04:51.884786196 +0100
-@@ -24570,6 +24570,7 @@
- if test "${enable_symvers+set}" = set; then :
-   enableval=$enable_symvers; case "$enableval" in
-          yes) libjava_cv_anon_version_script=yes ;;
-+         gnu*) libjava_cv_anon_version_script=yes ;;
-          no)  libjava_cv_anon_version_script=no ;;
-          *)   as_fn_error "Unknown argument to enable/disable symvers" "$LINENO" 5;;
-         esac
diff --git a/gcc-symvers.patch b/gcc-symvers.patch
new file mode 100644
index 0000000..94053c0
--- /dev/null
+++ b/gcc-symvers.patch
@@ -0,0 +1,22 @@
+--- libstdc++-v3/configure.orig	2012-03-02 08:13:55.000000000 +0100
++++ libstdc++-v3/configure	2012-03-25 12:31:53.278684698 +0200
+@@ -64773,7 +64773,7 @@
+ 	  	        esac
+ 
+ else
+-  enable_symvers=yes
++  enable_symvers=gnu-versioned-namespace
+ fi
+ 
+ 
+--- libstdc++-v3/configure.ac.orig	2012-03-25 12:31:14.966921062 +0200
++++ libstdc++-v3/configure.ac	2012-03-25 12:30:07.363809031 +0200
+@@ -308,7 +308,7 @@
+ 
+ GCC_HEADER_STDINT(include/gstdint.h)
+ 
+-GLIBCXX_ENABLE_SYMVERS([yes])
++GLIBCXX_ENABLE_SYMVERS([gnu-versioned-namespace])
+ AC_SUBST(libtool_VERSION)
+ 
+ GLIBCXX_ENABLE_LIBSTDCXX_VISIBILITY([yes])
diff --git a/gcc.spec b/gcc.spec
index d6c9dea..5918e74 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -98,7 +98,7 @@ Patch4:		%{name}-sparc64-ada_fix.patch
 Patch6:		%{name}-ppc64-m32-m64-multilib-only.patch
 Patch7:		%{name}-libjava-multilib.patch
 Patch8:		%{name}-enable-java-awt-qt.patch
-Patch9:		%{name}-libjava-symvers.patch
+Patch9:		%{name}-symvers.patch
 Patch10:	%{name}-moresparcs.patch
 
 Patch13:	issue4664051.patch
@@ -1573,7 +1573,6 @@ TEXCONFIG=false \
 	--enable-libstdcxx-allocator=new \
 	--enable-libstdcxx-threads \
 	--enable-libstdcxx-time=rt \
-	--enable-symvers=gnu-versioned-namespace \
 %endif
 %if %{with java}
 	--enable-static-libjava=yes \