- branch diff obsolete made 4.9-isl-0.13-hack.patch obsolete

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index 29dfb7392d83218a5d6afa2c42bf6d006d356c53..20494f22e44126e30d30cdf426187a57b2b3d178 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -21,6 +21,7 @@
 %bcond_without profiling       # build without profiling
 %bcond_without python          # build without libstdc++ printers for gdb and aot-compile for java
 %bcond_without asan            # build without Address Sanitizer library
+%bcond_without lsan            # build without Leak Sanitizer library
 %bcond_without tsan            # build without Thread Sanitizer library
 %bcond_without atomic          # build without library for atomic operations not supported by hardware
 %bcond_with    gcc_libffi      # packaging gcc libffi for system usage
@@ -78,6 +79,7 @@
 
 %ifnarch %{x8664}
 %undefine      with_tsan
+%undefine      with_lsan
 %endif
 
 %ifarch sparc64
@@ -97,7 +99,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:       3
 Epoch:         6
 License:       GPL v3+
 Group:         Development/Languages
@@ -110,13 +112,12 @@ Source2:  ftp://sourceware.org/pub/java/ecj-%{major_ecj_ver}.jar
 Source3:       libffi.pc.in
 # svn diff -x --ignore-eol-style --force svn://gcc.gnu.org/svn/gcc/tags/gcc_4_9_2_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch > gcc-branch.diff
 Patch100:      %{name}-branch.diff
-# Patch100-md5:        66e843617ce0bfe9764059752a9706d6
+# Patch100-md5:        1f1a11566ddf413cca96fbb04fd790d4
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-cloog.patch
 Patch2:                %{name}-nodebug.patch
 Patch3:                %{name}-ada-link.patch
 
-Patch5:                %{name}-4.9-isl-0.13-hack.patch
 Patch6:                %{name}-pr61164.patch
 Patch7:                %{name}-libjava-multilib.patch
 Patch8:                %{name}-enable-java-awt-qt.patch
@@ -1776,7 +1777,6 @@ Ten pakiet zawiera 32-bitową wersję statycznej biblioteki GNU Atomic.
 %patch2 -p1
 %patch3 -p1
 
-%patch5 -p1
 %patch6 -p1
 %patch7 -p0
 %if %{with qt}
@@ -1856,9 +1856,6 @@ TEXCONFIG=false \
        --enable-threads=posix \
        --disable-werror \
        --with-cloog \
-%ifarch %{ix86}
-       --with-arch=x86-64 \
-%endif
 %ifarch %{x8664}
        --with-arch-32=x86-64 \
 %endif
@@ -2066,7 +2063,7 @@ for f in libitm.la libssp.la libssp_nonshared.la \
        %{?with_fortran:libgfortran.la libquadmath.la} \
        %{?with_gomp:libgomp.la} \
        %{?with_asan:libasan.la} \
-       liblsan.la \
+       %{?with_lsan:liblsan.la} \
        %{?with_tsan:libtsan.la} \
        libubsan.la \
        %{?with_atomic:libatomic.la} \
@@ -3090,6 +3087,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
+%if %{with lsan}
 %files -n liblsan
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/liblsan.so.*.*.*
@@ -3104,6 +3102,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n liblsan-static
 %defattr(644,root,root,755)
 %{_libdir}/liblsan.a
+%endif
 
 %if %{with tsan}
 %files -n libtsan