From: Paweł Sikora Date: Mon, 18 Jun 2012 09:14:31 +0000 (+0000) Subject: - rollback fully versioned libstdc++ namespace (the outside software is full of buggy... X-Git-Tag: auto/th/gcc-4_7_1-2~2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgcc.git;a=commitdiff_plain;h=63b453efc51836203b41645914896b04b762c0ff - rollback fully versioned libstdc++ namespace (the outside software is full of buggy std:: forward declarations/redefinitions). - release 2. Changed files: gcc-symvers.patch -> 1.2 gcc.spec -> 1.695 --- diff --git a/gcc-symvers.patch b/gcc-symvers.patch deleted file mode 100644 index 94053c0..0000000 --- a/gcc-symvers.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 c1dff2d..3053d27 100644 --- a/gcc.spec +++ b/gcc.spec @@ -78,7 +78,7 @@ Summary(pl.UTF-8): Kolekcja kompilatorów GNU: kompilator C i pliki współdziel Summary(pt_BR.UTF-8): Coleção dos compiladores GNU: o compilador C e arquivos compartilhados Name: gcc Version: %{major_ver}.%{minor_ver} -Release: 1 +Release: 2 Epoch: 6 License: GPL v3+ Group: Development/Languages @@ -98,9 +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}-symvers.patch Patch10: %{name}-moresparcs.patch - Patch13: issue4664051.patch URL: http://gcc.gnu.org/ BuildRequires: autoconf >= 2.64 @@ -1478,7 +1476,6 @@ Statyczna biblioteka języka Go - wersja 32-bitowa. %if %{with qt} %patch8 -p1 %endif -%patch9 -p0 # update if you need it #%patch10 -p1 @@ -1573,6 +1570,7 @@ TEXCONFIG=false \ --enable-libstdcxx-allocator=new \ --enable-libstdcxx-threads \ --enable-libstdcxx-time=rt \ + --enable-symvers=gnu \ %endif %if %{with java} --enable-static-libjava=yes \