Tomas Chvatal
-# We don't want to build java -%ifarch mips -%define build_java 0 -%define build_libjava 0 -%else -%define build_java 1 -%define build_libjava 0%{?building_libjava:1}%{?building_libffi:1}%{?building_testsuite:1} -%endif - %define build_cp 1 %define build_fortran !0%{?building_libjava:1}%{?building_libffi:1} %define build_objc !0%{?building_libjava:1}%{?building_libffi:1} %define build_objcp !0%{?building_libjava:1}%{?building_libffi:1} %define build_go !0%{?building_libjava:1}%{?building_libffi:1} - -%if %{build_objcp} -%define build_cp 1 -%define build_objc 1 -%endif - -%if %{build_libjava} -%define build_cp 1 -%endif - -# For optional compilers only build C, C++, Fortran, Ada and Go -%if 0%{?build_optional_compiler_languages:1} -%define build_java 0 -%define build_libjava 0 -%define build_objc 0 -%define build_objcp 0 -%endif
Moving related build_foo macro definitions far apart from each others makes it harder to grok the specfile.
-%define separate_bi32 0 -%define separate_bi64 0 %ifarch ppc sparcv9 # Beware, this does _not_ separate libgcj, as for that one multilibing # is inactive for the time being @@ -210,9 +165,6 @@ %ifarch x86_64 s390x ppc64 sparc64 %define separate_bi32 1 %endif - -# Define two macros to trigger -32bit or -64bit package variants -%define separate_biarch 0 %if %{separate_bi32} %define separate_biarch 1 %define separate_biarch_suffix -32bit @@ -221,64 +173,20 @@ %define separate_biarch 1 %define separate_biarch_suffix -64bit %endif
Similarily, separating the default definition for a macro from its arch-specific redefinition is also not nice, especially since the comment is moved away as well.
+#testpatch end +Summary: The GNU C Compiler and Support Files +License: GPL-3.0+ +Group: Development/Languages/C and C++ +Url: http://gcc.gnu.org/ Source: gcc-%{gcc_version}%{gcc_snapshot_revision}.tar.bz2 Source1: change_spec Source2: libffi-gcc5-rpmlintrc @@ -287,9 +195,7 @@ Source5: README.First-for.SuSE.packagers Source6: baselibs.conf Source7: libgcj-gcc5-rpmlintrc - #testpatch begin - Patch1: gcc-dir-version.patch Patch2: gcc-add-defaultsspec.diff Patch3: Wunprototyped-calls.diff @@ -308,12 +214,80 @@ Patch61: gcc44-rename-info-files.patch # Some libgo patches Patch70: gcc5-libgo-fix-certificates-lookup.patch - -#testpatch end
Moving the comment will probably break some scripts. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-factory+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-factory+owner@opensuse.org