Hello community,
here is the log from the commit of package gcc46 for openSUSE:Factory checked in at 2012-01-27 21:26:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcc46 (Old)
and /work/SRC/openSUSE:Factory/.gcc46.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc46", Maintainer is "RGuenther@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gcc46/cross-arm-gcc-icecream-backend.changes 2012-01-06 11:43:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gcc46.new/cross-arm-gcc-icecream-backend.changes 2012-01-27 21:26:53.000000000 +0100
@@ -1,0 +2,35 @@
+Thu Jan 26 13:16:49 UTC 2012 - rguenther@suse.com
+
+- Adjust license tags to follow SPDX conventions.
+
+-------------------------------------------------------------------
+Mon Jan 23 09:28:15 UTC 2012 - rguenther@suse.com
+
+- Properly use FULLVER in cppbuiltin.c. [bnc#742747]
+
+-------------------------------------------------------------------
+Thu Jan 12 11:34:41 UTC 2012 - rguenther@suse.com
+
+- Use proper groups for the documentation packages. [bnc#732685]
+
+-------------------------------------------------------------------
+Thu Jan 5 08:47:31 UTC 2012 - rguenther@suse.com
+
+- When building libffi use make stage1-bubble to build the
+ C compiler, not make all-gcc.
+
+------------------------------------------------------------------
+Wed Dec 21 15:24:33 CET 2011 - dmueller@suse.de
+
+- run all-gcc first, otherwise /xgcc might not exist, so
+ make all-target-libffi fails to configure (depending on race
+ conditions)
+- apply changes from obs-service-format_spec_file to gcc.spec.in
+ to make diffing somehow sane:
+ * Release: is now always 0
+ * only one Buildrequires per tag
+ * Autoreqprov: on is default since ages and unneeded
+ * Summary: is the first line after %package
+ * Group comes before other tags
+
+-------------------------------------------------------------------
cross-hppa-gcc-icecream-backend.changes: same change
cross-i386-gcc-icecream-backend.changes: same change
cross-ia64-gcc-icecream-backend.changes: same change
cross-ppc-gcc-icecream-backend.changes: same change
cross-ppc64-gcc-icecream-backend.changes: same change
cross-s390-gcc-icecream-backend.changes: same change
cross-s390x-gcc-icecream-backend.changes: same change
cross-x86_64-gcc-icecream-backend.changes: same change
gcc46-testresults.changes: same change
gcc46.changes: same change
libffi46.changes: same change
libgcj46.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cross-arm-gcc-icecream-backend.spec ++++++
--- /var/tmp/diff_new_pack.IpdLmF/_old 2012-01-27 21:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.IpdLmF/_new 2012-01-27 21:26:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cross-arm-gcc-icecream-backend
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%define build_cp 1
%define build_ada 0
@@ -30,10 +29,20 @@
%define gcc_icecream 1
Name: cross-arm-gcc-icecream-backend
-BuildRequires: bison flex gettext-devel glibc-devel-32bit mpc-devel mpfr-devel perl texinfo zlib-devel
+BuildRequires: bison
BuildRequires: cross-arm-binutils
+BuildRequires: flex
+BuildRequires: gettext-devel
+BuildRequires: glibc-devel-32bit
+BuildRequires: mpc-devel
+BuildRequires: mpfr-devel
+BuildRequires: perl
+BuildRequires: texinfo
+BuildRequires: zlib-devel
%ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc
-BuildRequires: cloog-devel libelf-devel ppl-devel
+BuildRequires: cloog-devel
+BuildRequires: libelf-devel
+BuildRequires: ppl-devel
%endif
%ifarch ia64
BuildRequires: libunwind-devel
@@ -47,14 +56,13 @@
Url: http://gcc.gnu.org/
Version: 4.6.2_20111212
-Release: 1
+Release: 0
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/')
%define binsuffix -4.6
# COMMON-END
# COMMON-BEGIN
-AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2
Source1: change_spec
@@ -97,9 +105,9 @@
# GCC-TESTSUITE-DELETE-BEGIN
# LIBFFI-DELETE-BEGIN
# LIBJAVA-DELETE-BEGIN
-Group: Development/Languages/C and C++
Summary: The GNU C Compiler and Support Files
-License: GPLv3+
+License: GPL-3.0+
+Group: Development/Languages/C and C++
%description
Core package for the GNU Compiler Collection, including the C language
@@ -342,6 +350,9 @@
--enable-libstdcxx-allocator=new \
--disable-libstdcxx-pch \
--enable-version-specific-runtime-libs \
+%if 0%{suse_version} > 1100
+ --enable-linker-build-id \
+%endif
%if 0%{?gcc_target_arch:1}
%if 0%{?gcc_icecream:1}
--with-as=/opt/cross/%{TARGET_ARCH}-linux/bin/as \
@@ -368,9 +379,6 @@
--without-system-libunwind \
%endif
%endif
-%if 0%{suse_version} > 1100
- --enable-linker-build-id \
-%endif
%if "%{TARGET_ARCH}" == "armv5tel"
--with-arch=armv5te \
--with-float=softfp \
cross-hppa-gcc-icecream-backend.spec: same change
cross-i386-gcc-icecream-backend.spec: same change
cross-ia64-gcc-icecream-backend.spec: same change
cross-ppc-gcc-icecream-backend.spec: same change
cross-ppc64-gcc-icecream-backend.spec: same change
cross-s390-gcc-icecream-backend.spec: same change
cross-s390x-gcc-icecream-backend.spec: same change
cross-x86_64-gcc-icecream-backend.spec: same change
++++++ gcc46-testresults.spec ++++++
--- /var/tmp/diff_new_pack.IpdLmF/_old 2012-01-27 21:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.IpdLmF/_new 2012-01-27 21:26:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gcc46-testresults
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -14,8 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-# norootforbuild
# icecream 0
%define building_testsuite 1
@@ -80,9 +78,19 @@
%endif
Name: gcc46-testresults
-BuildRequires: bison flex gettext-devel glibc-devel-32bit mpc-devel mpfr-devel perl texinfo zlib-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gettext-devel
+BuildRequires: glibc-devel-32bit
+BuildRequires: mpc-devel
+BuildRequires: mpfr-devel
+BuildRequires: perl
+BuildRequires: texinfo
+BuildRequires: zlib-devel
+
%ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc hppa %arm
-BuildRequires: cloog-devel ppl-devel
+BuildRequires: cloog-devel
+BuildRequires: ppl-devel
%endif
%if %{build_ada}
%if %{suse_version} > 1210
@@ -94,7 +102,10 @@
%endif
%endif
%if 0%{?building_libjava:1}%{?building_testsuite:1}
-BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar
+BuildRequires: gtk2-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: unzip
%endif
%if 0%{?building_libffi:1}
BuildRequires: pkg-config
@@ -103,7 +114,9 @@
BuildRequires: libunwind-devel
%endif
%if 0%{?run_tests:1}
-BuildRequires: dejagnu expect gdb
+BuildRequires: dejagnu
+BuildRequires: expect
+BuildRequires: gdb
%endif
# Define version number of libgcc_s
@@ -156,7 +169,7 @@
Url: http://gcc.gnu.org/
Version: 4.6.2_20111212
-Release: 1
+Release: 0
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/')
@@ -184,7 +197,6 @@
%endif
# COMMON-BEGIN
-AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2
Source1: change_spec
@@ -224,8 +236,8 @@
# http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
Patch150: gcc46-arm-volatile.patch
-License: Public Domain, Freeware
Summary: Testsuite results
+License: SUSE-Public-Domain
Group: Development/Languages/C and C++
%description
@@ -575,6 +587,9 @@
--enable-libstdcxx-allocator=new \
--disable-libstdcxx-pch \
--enable-version-specific-runtime-libs \
+%if 0%{suse_version} > 1100
+ --enable-linker-build-id \
+%endif
%if 0%{?gcc_target_arch:1}
%if 0%{?gcc_icecream:1}
--with-as=/opt/cross/%{TARGET_ARCH}-linux/bin/as \
@@ -601,9 +616,6 @@
--without-system-libunwind \
%endif
%endif
-%if 0%{suse_version} > 1100
- --enable-linker-build-id \
-%endif
%if "%{TARGET_ARCH}" == "armv5tel"
--with-arch=armv5te \
--with-float=softfp \
@@ -661,6 +673,7 @@
# COMMON-END
%if 0%{?building_libffi:1}
+make stage1-bubble $PARALLEL
make all-target-libffi $PARALLEL
%else
# Only run profiled bootstrap on archs where it works
@@ -697,7 +710,6 @@
%endif
%if 0%{?run_tests:1}
-
%files
%defattr(-,root,root)
%doc testresults/test_summary.txt
++++++ gcc46.spec ++++++
++++ 1378 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/gcc46/gcc46.spec
++++ and /work/SRC/openSUSE:Factory/.gcc46.new/gcc46.spec
++++++ libffi46.spec ++++++
--- /var/tmp/diff_new_pack.IpdLmF/_old 2012-01-27 21:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.IpdLmF/_new 2012-01-27 21:26:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libffi46
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -14,8 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-# norootforbuild
# icecream 0
%define building_libffi 1
@@ -79,9 +77,19 @@
%endif
Name: libffi46
-BuildRequires: bison flex gettext-devel glibc-devel-32bit mpc-devel mpfr-devel perl texinfo zlib-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gettext-devel
+BuildRequires: glibc-devel-32bit
+BuildRequires: mpc-devel
+BuildRequires: mpfr-devel
+BuildRequires: perl
+BuildRequires: texinfo
+BuildRequires: zlib-devel
+
%ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc hppa %arm
-BuildRequires: cloog-devel ppl-devel
+BuildRequires: cloog-devel
+BuildRequires: ppl-devel
%endif
%if %{build_ada}
%if %{suse_version} > 1210
@@ -93,7 +101,10 @@
%endif
%endif
%if 0%{?building_libjava:1}%{?building_testsuite:1}
-BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar
+BuildRequires: gtk2-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: unzip
%endif
%if 0%{?building_libffi:1}
BuildRequires: pkg-config
@@ -102,7 +113,9 @@
BuildRequires: libunwind-devel
%endif
%if 0%{?run_tests:1}
-BuildRequires: dejagnu expect gdb
+BuildRequires: dejagnu
+BuildRequires: expect
+BuildRequires: gdb
%endif
# Define version number of libgcc_s
@@ -155,7 +168,7 @@
Url: http://gcc.gnu.org/
Version: 4.6.2_20111212
-Release: 1
+Release: 0
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/')
@@ -183,7 +196,6 @@
%endif
# COMMON-BEGIN
-AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2
Source1: change_spec
@@ -226,10 +238,9 @@
# GCC-TESTSUITE-DELETE-BEGIN
# PACKAGE-BEGIN
# PACKAGE-BEGIN
-License: BSD3c
Summary: Foreign Function Interface library
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Provides: g-wrap:/usr/lib/libffi.so.4
Provides: libffi4 = %{version}-%{release}
Conflicts: libffi4 < %{version}-%{release}
@@ -245,12 +256,10 @@
# PACKAGE-END
# PACKAGE-BEGIN
# PACKAGE-BEGIN
-
%package -n libffi46-32bit
-License: BSD3c
Summary: Foreign Function Interface library
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Provides: g-wrap:/usr/lib/libffi.so.4
Provides: libffi4-32bit = %{version}-%{release}
Conflicts: libffi4-32bit < %{version}-%{release}
@@ -266,12 +275,10 @@
# PACKAGE-END
# PACKAGE-BEGIN
# PACKAGE-BEGIN
-
%package -n libffi46-64bit
-License: BSD3c
Summary: Foreign Function Interface library
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Provides: g-wrap:/usr/lib/libffi.so.4
Provides: libffi4-64bit = %{version}-%{release}
Conflicts: libffi4-64bit < %{version}-%{release}
@@ -288,12 +295,10 @@
# PACKAGE-BEGIN
# PACKAGE-BEGIN
-
%package -n libffi46-devel
-License: BSD 3-Clause
Summary: Foreign Function Interface library development files
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Requires: libffi4 >= %{version}-%{release}
Provides: libffi-devel = %{version}-%{release}
Conflicts: libffi-devel < %{version}-%{release}
@@ -304,10 +309,9 @@
# PACKAGE-BEGIN
# PACKAGE-BEGIN
%package -n libffi46-devel-32bit
-License: BSD 3-Clause
Summary: Foreign Function Interface library development files
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Requires: libffi4-32bit >= %{version}-%{release}
Provides: libffi-devel-32bit = %{version}-%{release}
Conflicts: libffi-devel-32bit < %{version}-%{release}
@@ -318,10 +322,9 @@
# PACKAGE-BEGIN
# PACKAGE-BEGIN
%package -n libffi46-devel-64bit
-License: BSD 3-Clause
Summary: Foreign Function Interface library development files
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Requires: libffi4-64bit >= %{version}-%{release}
Provides: libffi-devel-64bit = %{version}-%{release}
Conflicts: libffi-devel-64bit < %{version}-%{release}
@@ -332,8 +335,8 @@
%package -n gcc46-testresults
# GCC-TESTSUITE-DELETE-END
-License: Public Domain, Freeware
Summary: Testsuite results
+License: SUSE-Public-Domain
Group: Development/Languages/C and C++
%description -n gcc46-testresults
@@ -683,6 +686,9 @@
--enable-libstdcxx-allocator=new \
--disable-libstdcxx-pch \
--enable-version-specific-runtime-libs \
+%if 0%{suse_version} > 1100
+ --enable-linker-build-id \
+%endif
%if 0%{?gcc_target_arch:1}
%if 0%{?gcc_icecream:1}
--with-as=/opt/cross/%{TARGET_ARCH}-linux/bin/as \
@@ -709,9 +715,6 @@
--without-system-libunwind \
%endif
%endif
-%if 0%{suse_version} > 1100
- --enable-linker-build-id \
-%endif
%if "%{TARGET_ARCH}" == "armv5tel"
--with-arch=armv5te \
--with-float=softfp \
@@ -769,6 +772,7 @@
# COMMON-END
%if 0%{?building_libffi:1}
+make stage1-bubble $PARALLEL
make all-target-libffi $PARALLEL
%else
# Only run profiled bootstrap on archs where it works
@@ -1014,18 +1018,14 @@
%if %{build_java}
%if 0%{?building_libffi:1}
-
%files
%defattr(-,root,root)
%mainlib libffi.so.*
-
%if %{separate_biarch}
-
%files -n libffi46%{separate_biarch_suffix}
%defattr(-,root,root)
%biarchlib libffi.so.*
-
%endif
%files -n libffi46-devel
@@ -1033,29 +1033,23 @@
%{_prefix}/include/ffi.h
%{_prefix}/include/ffitarget.h
%mainlib libffi.so
-
%mainlib libffi.a
-
%{_libdir}/pkgconfig/libffi.pc
%doc %{_mandir}/man3/ffi%{binsuffix}.3.gz
%doc %{_mandir}/man3/ffi_call%{binsuffix}.3.gz
%doc %{_mandir}/man3/ffi_prep_cif%{binsuffix}.3.gz
%if %{separate_biarch}
-
%files -n libffi46-devel%{separate_biarch_suffix}
%defattr(-,root,root)
%biarchlib libffi.so
-
%biarchlib libffi.a
-
%endif
%endif
%endif
# GCC-TESTSUITE-DELETE-END
%if 0%{?run_tests:1}
-
%files -n gcc46-testresults
%defattr(-,root,root)
%doc testresults/test_summary.txt
++++++ libgcj46.spec ++++++
--- /var/tmp/diff_new_pack.IpdLmF/_old 2012-01-27 21:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.IpdLmF/_new 2012-01-27 21:26:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libgcj46
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -14,8 +14,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-# norootforbuild
# icecream 0
%define building_libjava 1
@@ -79,9 +77,19 @@
%endif
Name: libgcj46
-BuildRequires: bison flex gettext-devel glibc-devel-32bit mpc-devel mpfr-devel perl texinfo zlib-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gettext-devel
+BuildRequires: glibc-devel-32bit
+BuildRequires: mpc-devel
+BuildRequires: mpfr-devel
+BuildRequires: perl
+BuildRequires: texinfo
+BuildRequires: zlib-devel
+
%ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc hppa %arm
-BuildRequires: cloog-devel ppl-devel
+BuildRequires: cloog-devel
+BuildRequires: ppl-devel
%endif
%if %{build_ada}
%if %{suse_version} > 1210
@@ -93,7 +101,10 @@
%endif
%endif
%if 0%{?building_libjava:1}%{?building_testsuite:1}
-BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar
+BuildRequires: gtk2-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: unzip
%endif
%if 0%{?building_libffi:1}
BuildRequires: pkg-config
@@ -102,7 +113,9 @@
BuildRequires: libunwind-devel
%endif
%if 0%{?run_tests:1}
-BuildRequires: dejagnu expect gdb
+BuildRequires: dejagnu
+BuildRequires: expect
+BuildRequires: gdb
%endif
# Define version number of libgcc_s
@@ -155,7 +168,7 @@
Url: http://gcc.gnu.org/
Version: 4.6.2_20111212
-Release: 1
+Release: 0
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/')
@@ -183,7 +196,6 @@
%endif
# COMMON-BEGIN
-AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2
Source1: change_spec
@@ -225,8 +237,8 @@
# GCC-TESTSUITE-DELETE-BEGIN
# LIBFFI-DELETE-BEGIN
-License: GPLv2+ < 1000
@@ -238,7 +250,6 @@
Conflicts: libgij%{gcj_sover} < %{version}-%{release}
Provides: libgcj-tools%{gcj_sover} = %{version}-%{release}
Conflicts: libgcj-tools%{gcj_sover} < %{version}-%{release}
-AutoReqProv: on
%description
This library is needed if you want to use the GNU Java compiler, gcj.
@@ -251,10 +262,9 @@
/sbin/ldconfig
%package -n gcc46-java
-License: GPLv3+
Summary: The GNU Java Compiler
+License: GPL-3.0+
Group: Development/Languages/Java
-AutoReqProv: on
Requires: gcc46 = %{version}
Requires: libgcj46-devel = %{version}-%{release}
@@ -263,10 +273,9 @@
%package -n libgcj_bc46
-License: GPLv2+ <= %{version}-%{release}
Requires: libgcj_bc1 >= %{version}-%{release}
@@ -319,9 +327,9 @@
%package -n gcc46-gij
Summary: Java Bytecode Interpreter for gcc
+License: GPL-2.0-with-classpath-exception
Group: Development/Libraries/Java
Requires: libgcj%{gcj_sover} >= %{version}-%{release}
-AutoReqProv: on
%description -n gcc46-gij
This package contains the java bytecode interpreter gij and related tools.
@@ -330,10 +338,9 @@
# PACKAGE-BEGIN
# PACKAGE-BEGIN
%package -n libffi46
-License: BSD3c
Summary: Foreign Function Interface library
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Provides: g-wrap:/usr/lib/libffi.so.4
Provides: libffi4 = %{version}-%{release}
Conflicts: libffi4 < %{version}-%{release}
@@ -349,12 +356,10 @@
# PACKAGE-END
# PACKAGE-BEGIN
# PACKAGE-BEGIN
-
%package -n libffi46-32bit
-License: BSD3c
Summary: Foreign Function Interface library
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Provides: g-wrap:/usr/lib/libffi.so.4
Provides: libffi4-32bit = %{version}-%{release}
Conflicts: libffi4-32bit < %{version}-%{release}
@@ -370,12 +375,10 @@
# PACKAGE-END
# PACKAGE-BEGIN
# PACKAGE-BEGIN
-
%package -n libffi46-64bit
-License: BSD3c
Summary: Foreign Function Interface library
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Provides: g-wrap:/usr/lib/libffi.so.4
Provides: libffi4-64bit = %{version}-%{release}
Conflicts: libffi4-64bit < %{version}-%{release}
@@ -392,12 +395,10 @@
# PACKAGE-BEGIN
# PACKAGE-BEGIN
-
%package -n libffi46-devel
-License: BSD 3-Clause
Summary: Foreign Function Interface library development files
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Requires: libffi4 >= %{version}-%{release}
Provides: libffi-devel = %{version}-%{release}
Conflicts: libffi-devel < %{version}-%{release}
@@ -408,10 +409,9 @@
# PACKAGE-BEGIN
# PACKAGE-BEGIN
%package -n libffi46-devel-32bit
-License: BSD 3-Clause
Summary: Foreign Function Interface library development files
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Requires: libffi4-32bit >= %{version}-%{release}
Provides: libffi-devel-32bit = %{version}-%{release}
Conflicts: libffi-devel-32bit < %{version}-%{release}
@@ -422,10 +422,9 @@
# PACKAGE-BEGIN
# PACKAGE-BEGIN
%package -n libffi46-devel-64bit
-License: BSD 3-Clause
Summary: Foreign Function Interface library development files
+License: BSD-3-Clause
Group: Development/Languages/C and C++
-AutoReqProv: on
Requires: libffi4-64bit >= %{version}-%{release}
Provides: libffi-devel-64bit = %{version}-%{release}
Conflicts: libffi-devel-64bit < %{version}-%{release}
@@ -436,8 +435,8 @@
%package -n gcc46-testresults
# GCC-TESTSUITE-DELETE-END
-License: Public Domain, Freeware
Summary: Testsuite results
+License: SUSE-Public-Domain
Group: Development/Languages/C and C++
%description -n gcc46-testresults
@@ -787,6 +786,9 @@
--enable-libstdcxx-allocator=new \
--disable-libstdcxx-pch \
--enable-version-specific-runtime-libs \
+%if 0%{suse_version} > 1100
+ --enable-linker-build-id \
+%endif
%if 0%{?gcc_target_arch:1}
%if 0%{?gcc_icecream:1}
--with-as=/opt/cross/%{TARGET_ARCH}-linux/bin/as \
@@ -813,9 +815,6 @@
--without-system-libunwind \
%endif
%endif
-%if 0%{suse_version} > 1100
- --enable-linker-build-id \
-%endif
%if "%{TARGET_ARCH}" == "armv5tel"
--with-arch=armv5te \
--with-float=softfp \
@@ -873,6 +872,7 @@
# COMMON-END
%if 0%{?building_libffi:1}
+make stage1-bubble $PARALLEL
make all-target-libffi $PARALLEL
%else
# Only run profiled bootstrap on archs where it works
@@ -1226,7 +1226,6 @@
%if %{build_java}
%if 0%{?building_libjava:1}
-
%files -n gcc46-java
%defattr(-,root,root)
%{_prefix}/bin/gcj%{binsuffix}
@@ -1254,7 +1253,6 @@
%if %{build_java}
%if %{build_libjava}
-
%files
%defattr(-,root,root)
%dir %{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}
@@ -1265,22 +1263,14 @@
# We usually do not multilib libjava
%if %{biarch_libjava}
%versbiarchlib libgcj.la
-
%biarchlib libgcj.so.*
-
%biarchlib libgij.so.*
-
%biarchlib libgcj-tools.so.*
-
%else
%versmainlib libgcj.la
-
%mainlib libgcj.so.*
-
%mainlib libgij.so.*
-
%mainlib libgcj-tools.so.*
-
%endif
%{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}/libgtkpeer.la
%{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}/libgtkpeer.so
@@ -1295,10 +1285,8 @@
%defattr(-,root,root)
%if %{biarch_libjava}
%biarchlib libgcj_bc.so.*
-
%else
%mainlib libgcj_bc.so.*
-
%endif
%files -n libgcj46-jar
@@ -1327,26 +1315,16 @@
%{libsubdir}/include/gcj
%if %{biarch_libjava}
%versbiarchlib libgcj.so
-
%versbiarchlib libgcj.spec
-
%versbiarchlib libgcj-tools.so
-
%versbiarchlib libgij.so
-
%versbiarchlib libgcj_bc.so
-
%else
%versmainlib libgcj.so
-
%versmainlib libgcj.spec
-
%versmainlib libgcj-tools.so
-
%versmainlib libgij.so
-
%versmainlib libgcj_bc.so
-
%endif
%files -n gcc46-gij
@@ -1383,18 +1361,14 @@
%if %{build_java}
%if 0%{?building_libffi:1}
-
%files -n libffi46
%defattr(-,root,root)
%mainlib libffi.so.*
-
%if %{separate_biarch}
-
%files -n libffi46%{separate_biarch_suffix}
%defattr(-,root,root)
%biarchlib libffi.so.*
-
%endif
%files -n libffi46-devel
@@ -1402,29 +1376,23 @@
%{_prefix}/include/ffi.h
%{_prefix}/include/ffitarget.h
%mainlib libffi.so
-
%mainlib libffi.a
-
%{_libdir}/pkgconfig/libffi.pc
%doc %{_mandir}/man3/ffi%{binsuffix}.3.gz
%doc %{_mandir}/man3/ffi_call%{binsuffix}.3.gz
%doc %{_mandir}/man3/ffi_prep_cif%{binsuffix}.3.gz
%if %{separate_biarch}
-
%files -n libffi46-devel%{separate_biarch_suffix}
%defattr(-,root,root)
%biarchlib libffi.so
-
%biarchlib libffi.a
-
%endif
%endif
%endif
# GCC-TESTSUITE-DELETE-END
%if 0%{?run_tests:1}
-
%files -n gcc46-testresults
%defattr(-,root,root)
%doc testresults/test_summary.txt
++++++ change_spec ++++++
--- /var/tmp/diff_new_pack.IpdLmF/_old 2012-01-27 21:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.IpdLmF/_new 2012-01-27 21:26:57.000000000 +0100
@@ -1,5 +1,19 @@
-#!/bin/bash
+#
+# spec file for package
+#
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
do_icecream=1
do_cross_static=1
do_cross_shared=1
@@ -111,7 +125,6 @@
fi
fi
-
# disabled: mips, sparc, alpha
if test "$do_icecream" = 1 ; then
for arch in hppa i386 x86_64 s390 s390x ppc ppc64 ia64 arm; do
@@ -144,3 +157,5 @@
# test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes cross-avr-gcc$base_ver.changes
fi
exit 0
+
+%changelog
++++++ gcc-dir-version.patch ++++++
--- /var/tmp/diff_new_pack.IpdLmF/_old 2012-01-27 21:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.IpdLmF/_new 2012-01-27 21:26:57.000000000 +0100
@@ -1,127 +1,95 @@
Index: gcc/Makefile.in
===================================================================
-*** gcc/Makefile.in.orig 2010-11-05 13:58:02.000000000 +0100
---- gcc/Makefile.in 2010-11-05 14:26:15.000000000 +0100
-*************** GTM_H = tm.h $(tm_file_list) in
-*** 819,830 ****
- TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)
-
- # Variables for version information.
-! BASEVER := $(srcdir)/BASE-VER # 4.x.y
- DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
- DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty
- REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]
-
- BASEVER_c := $(shell cat $(BASEVER))
- DEVPHASE_c := $(shell cat $(DEVPHASE))
- DATESTAMP_c := $(shell cat $(DATESTAMP))
-
---- 819,832 ----
- TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)
-
- # Variables for version information.
-! BASEVER := $(srcdir)/BASE-VER # 4.x
-! FULLVER := $(srcdir)/FULL-VER # 4.x.y
- DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
- DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty
- REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]
-
- BASEVER_c := $(shell cat $(BASEVER))
-+ FULLVER_c := $(shell cat $(FULLVER))
- DEVPHASE_c := $(shell cat $(DEVPHASE))
- DATESTAMP_c := $(shell cat $(DATESTAMP))
-
-*************** version := $(BASEVER_c)
-*** 843,848 ****
---- 845,851 ----
- # (i.e. if DEVPHASE_c is empty). The space immediately after the
- # comma in the $(if ...) constructs is significant - do not remove it.
- BASEVER_s := "\"$(BASEVER_c)\""
-+ FULLVER_s := "\"$(FULLVER_c)\""
- DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
- DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
- PKGVERSION_s:= "\"@PKGVERSION@\""
-*************** gcc-options.o: options.c $(CONFIG_H) $(S
-*** 2240,2248 ****
-
- dumpvers: dumpvers.c
-
-! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
- $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \
-! -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
- -DREVISION=$(REVISION_s) \
- -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
- -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION)
---- 2243,2251 ----
-
- dumpvers: dumpvers.c
-
-! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
- $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \
-! -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
- -DREVISION=$(REVISION_s) \
- -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
- -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION)
+--- gcc/Makefile.in.orig 2011-08-29 09:59:00.000000000 +0200
++++ gcc/Makefile.in 2012-01-24 10:19:46.000000000 +0100
+@@ -832,12 +832,14 @@ GTM_H = tm.h $(tm_file_list) in
+ TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H)
+
+ # Variables for version information.
+-BASEVER := $(srcdir)/BASE-VER # 4.x.y
++BASEVER := $(srcdir)/BASE-VER # 4.x
++FULLVER := $(srcdir)/FULL-VER # 4.x.y
+ DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, ""
+ DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty
+ REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX]
+
+ BASEVER_c := $(shell cat $(BASEVER))
++FULLVER_c := $(shell cat $(FULLVER))
+ DEVPHASE_c := $(shell cat $(DEVPHASE))
+ DATESTAMP_c := $(shell cat $(DATESTAMP))
+
+@@ -856,6 +858,7 @@ version := $(BASEVER_c)
+ # (i.e. if DEVPHASE_c is empty). The space immediately after the
+ # comma in the $(if ...) constructs is significant - do not remove it.
+ BASEVER_s := "\"$(BASEVER_c)\""
++FULLVER_s := "\"$(FULLVER_c)\""
+ DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
+ DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
+ PKGVERSION_s:= "\"@PKGVERSION@\""
+@@ -2255,9 +2258,9 @@ gcc-options.o: options.c $(CONFIG_H) $(S
+
+ dumpvers: dumpvers.c
+
+-version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE)
++version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE)
+ $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \
+- -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
++ -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \
+ -DREVISION=$(REVISION_s) \
+ -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
+ -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION)
Index: libjava/Makefile.am
===================================================================
-*** libjava/Makefile.am.orig 2010-08-27 12:08:41.000000000 +0200
---- libjava/Makefile.am 2010-11-05 14:25:12.000000000 +0100
-*************** install_data_local_split = 50
-*** 774,780 ****
- install-data-local:
- $(PRE_INSTALL)
- ## Install the .pc file.
-! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
- file="libgcj-$${pc_version}.pc"; \
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
- echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
---- 774,780 ----
- install-data-local:
- $(PRE_INSTALL)
- ## Install the .pc file.
-! @pc_version=`echo $(GCJVERSION)`; \
- file="libgcj-$${pc_version}.pc"; \
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
- echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
+--- libjava/Makefile.am.orig 2011-03-14 15:08:15.000000000 +0100
++++ libjava/Makefile.am 2012-01-24 10:19:46.000000000 +0100
+@@ -774,7 +774,7 @@ install_data_local_split = 50
+ install-data-local:
+ $(PRE_INSTALL)
+ ## Install the .pc file.
+- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
++ @pc_version=`echo $(GCJVERSION)`; \
+ file="libgcj-$${pc_version}.pc"; \
+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
+ echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
Index: libjava/Makefile.in
===================================================================
-*** libjava/Makefile.in.orig 2010-11-05 13:59:46.000000000 +0100
---- libjava/Makefile.in 2010-11-05 14:25:12.000000000 +0100
-*************** install-exec-hook: install-binPROGRAMS i
-*** 12407,12413 ****
- @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
- install-data-local:
- $(PRE_INSTALL)
-! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
- file="libgcj-$${pc_version}.pc"; \
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
- echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
---- 12407,12413 ----
- @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
- install-data-local:
- $(PRE_INSTALL)
-! @pc_version=`echo $(GCJVERSION)`; \
- file="libgcj-$${pc_version}.pc"; \
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
- echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
+--- libjava/Makefile.in.orig 2011-12-12 10:12:51.000000000 +0100
++++ libjava/Makefile.in 2012-01-24 10:19:46.000000000 +0100
+@@ -12410,7 +12410,7 @@ install-exec-hook: install-binPROGRAMS i
+ @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
+ install-data-local:
+ $(PRE_INSTALL)
+- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
++ @pc_version=`echo $(GCJVERSION)`; \
+ file="libgcj-$${pc_version}.pc"; \
+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \
+ echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \
Index: libjava/testsuite/lib/libjava.exp
===================================================================
-*** libjava/testsuite/lib/libjava.exp.orig 2009-12-14 00:18:47.000000000 +0100
---- libjava/testsuite/lib/libjava.exp 2010-11-05 14:25:12.000000000 +0100
-*************** proc libjava_init { args } {
-*** 175,181 ****
-
- set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
- regexp " version \[^\n\r\]*" $text version
-! set libjava_version [lindex $version 1]
-
- verbose "version: $libjava_version"
-
---- 175,181 ----
-
- set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
- regexp " version \[^\n\r\]*" $text version
-! set libjava_version 4.6
-
- verbose "version: $libjava_version"
-
+--- libjava/testsuite/lib/libjava.exp.orig 2011-03-14 15:08:07.000000000 +0100
++++ libjava/testsuite/lib/libjava.exp 2012-01-24 10:19:46.000000000 +0100
+@@ -175,7 +175,7 @@ proc libjava_init { args } {
+
+ set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
+ regexp " version \[^\n\r\]*" $text version
+- set libjava_version [lindex $version 1]
++ set libjava_version 4.6
+
+ verbose "version: $libjava_version"
+
+Index: gcc/cppbuiltin.c
+===================================================================
+--- gcc/cppbuiltin.c.orig 2011-03-14 15:04:06.000000000 +0100
++++ gcc/cppbuiltin.c 2012-01-24 10:22:18.000000000 +0100
+@@ -38,9 +38,9 @@ parse_basever (int *major, int *minor, i
+ static int s_major = -1, s_minor, s_patchlevel;
+
+ if (s_major == -1)
+- if (sscanf (BASEVER, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
++ if (sscanf (version_string, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3)
+ {
+- sscanf (BASEVER, "%d.%d", &s_major, &s_minor);
++ sscanf (version_string, "%d.%d", &s_major, &s_minor);
+ s_patchlevel = 0;
+ }
+
++++++ gcc.spec.in ++++++
--- /var/tmp/diff_new_pack.IpdLmF/_old 2012-01-27 21:26:57.000000000 +0100
+++ /var/tmp/diff_new_pack.IpdLmF/_new 2012-01-27 21:26:57.000000000 +0100
@@ -64,9 +64,19 @@
Name: gcc@base_ver@
-BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel mpc-devel
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gettext-devel
+BuildRequires: glibc-devel-32bit
+BuildRequires: mpc-devel
+BuildRequires: mpfr-devel
+BuildRequires: perl
+BuildRequires: texinfo
+BuildRequires: zlib-devel
+
%ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64 %sparc hppa %arm
-BuildRequires: cloog-devel ppl-devel
+BuildRequires: cloog-devel
+BuildRequires: ppl-devel
%endif
%if %{build_ada}
%if %{suse_version} > 1210
@@ -78,7 +88,10 @@
%endif
%endif
%if 0%{?building_libjava:1}%{?building_testsuite:1}
-BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar
+BuildRequires: gtk2-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: unzip
%endif
%if 0%{?building_libffi:1}
BuildRequires: pkg-config
@@ -87,7 +100,9 @@
BuildRequires: libunwind-devel
%endif
%if 0%{?run_tests:1}
-BuildRequires: dejagnu expect gdb
+BuildRequires: dejagnu
+BuildRequires: expect
+BuildRequires: gdb
%endif
# Define version number of libgcc_s
@@ -140,7 +155,7 @@
URL: http://gcc.gnu.org/
Version: 4.6.2_20111212
-Release: 1
+Release: 0
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/')
@@ -168,7 +183,6 @@
%endif
# COMMON-BEGIN
-Autoreqprov: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2
Source1: change_spec
@@ -213,7 +227,7 @@
# LIBJAVA-DELETE-BEGIN
Group: Development/Languages/C and C++
Summary: The GNU C Compiler and Support Files
-License: GPLv3+
+License: GPL-3.0+
%description
Core package for the GNU Compiler Collection, including the C language
@@ -229,7 +243,6 @@
%package -n gcc@base_ver@-32bit
Summary: The GNU C Compiler 32bit support
Group: Development/Languages/C and C++
-Autoreqprov: on
Requires: gcc@base_ver@ = %{version}-%{release}
%if 0%{!?build_optional_compiler:1}
Requires: libgcc%{libgcc_s}-32bit >= %{version}-%{release}
@@ -250,7 +263,6 @@
%package -n gcc@base_ver@-64bit
Summary: The GNU C Compiler 64bit support
Group: Development/Languages/C and C++
-Autoreqprov: on
Requires: gcc@base_ver@ = %{version}-%{release}
%if 0%{!?build_optional_compiler:1}
Requires: libgcc%{libgcc_s}-64bit >= %{version}-%{release}
@@ -270,11 +282,10 @@
%package locale
-License: GPLv3+
Summary: Locale Data for the GNU Compiler Collection
+License: GPL-3.0+
Group: Development/Languages/C and C++
Requires: gcc@base_ver@ = %{version}-%{release}
-Autoreqprov: on
%description locale
Locale data for the GNU Compiler Collection (GCC) to give error message
@@ -282,10 +293,9 @@
%package c++
-License: GPLv3+
Summary: The GNU C++ Compiler
+License: GPL-3.0+
Group: Development/Languages/C and C++
-Autoreqprov: on
Requires: gcc@base_ver@ = %{version}-%{release}
Requires: libstdc++@base_ver@-devel = %{version}-%{release}
@@ -294,10 +304,9 @@
# PACKAGE-BEGIN
%package -n libstdc++@base_ver@-devel@variant@
-License: GPLv3+ <= %{version}-%{release}
%else
@@ -314,13 +323,12 @@
# PACKAGE-END
%package -n libstdc++@base_ver@-doc
-License: GPLv3+
Summary: Documentation for the GNU C++ standard library
-Group: Development/Languages/C and C++
+License: GPL-3.0+
+Group: Documentation/HTML
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
-Autoreqprov: on
%description -n libstdc++@base_ver@-doc
Extensive HTML documentation for the GNU C++ standard library.
@@ -328,13 +336,12 @@
# PACKAGE-BEGIN
%package -n libgcc@base_ver@@variant@
-License: GPLv3+ <= 1120
BuildArch: noarch
@@ -412,10 +416,9 @@
# PACKAGE-BEGIN
%package objc@variant@
-License: GPLv3+
Summary: GNU Objective C Compiler
+License: GPL-3.0+
Group: Development/Languages/Other
-Autoreqprov: on
Requires: gcc@base_ver@ = %{version}-%{release}
Requires: libobjc2@variant@ >= %{version}-%{release}
@@ -427,8 +430,8 @@
# PACKAGE-BEGIN
%package -n libobjc@base_ver@@variant@
-License: GPLv3+ <= %{version}-%{release}
@@ -534,13 +533,12 @@
# PACKAGE-BEGIN
%package -n libgfortran@base_ver@@variant@
-License: GPLv3+ < 1000
@@ -614,7 +610,6 @@
Conflicts: libgij%{gcj_sover} < %{version}-%{release}
Provides: libgcj-tools%{gcj_sover} = %{version}-%{release}
Conflicts: libgcj-tools%{gcj_sover} < %{version}-%{release}
-Autoreqprov: on
%description -n libgcj@base_ver@
This library is needed if you want to use the GNU Java compiler, gcj.
@@ -628,10 +623,9 @@
%package -n gcc@base_ver@-java
-License: GPLv3+
Summary: The GNU Java Compiler
+License: GPL-3.0+
Group: Development/Languages/Java
-Autoreqprov: on
Requires: gcc@base_ver@ = %{version}
Requires: libgcj@base_ver@-devel = %{version}-%{release}
@@ -640,10 +634,9 @@
%package -n libgcj_bc@base_ver@
-License: GPLv2+ <= %{version}-%{release}
Requires: libgcj_bc1 >= %{version}-%{release}
@@ -699,7 +691,6 @@
Summary: Java Bytecode Interpreter for gcc
Group: Development/Libraries/Java
Requires: libgcj%{gcj_sover} >= %{version}-%{release}
-Autoreqprov: on
%description -n gcc@base_ver@-gij
This package contains the java bytecode interpreter gij and related tools.
@@ -707,10 +698,9 @@
# LIBFFI-DELETE-END
# PACKAGE-BEGIN
%package -n libffi@base_ver@@variant@
-License: BSD3c
Summary: Foreign Function Interface library
+License: BSD3c
Group: Development/Languages/C and C++
-Autoreqprov: on
Provides: g-wrap:/usr/lib/libffi.so.4
Provides: libffi4@variant@ = %{version}-%{release}
Conflicts: libffi4@variant@ < %{version}-%{release}
@@ -727,10 +717,9 @@
# PACKAGE-BEGIN
%package -n libffi@base_ver@-devel@variant@
-License: BSD 3-Clause
Summary: Foreign Function Interface library development files
+License: BSD 3-Clause
Group: Development/Languages/C and C++
-Autoreqprov: on
Requires: libffi4@variant@ >= %{version}-%{release}
Provides: libffi-devel@variant@ = %{version}-%{release}
Conflicts: libffi-devel@variant@ < %{version}-%{release}
@@ -741,8 +730,8 @@
%package -n gcc@base_ver@-testresults
# GCC-TESTSUITE-DELETE-END
-License: Public Domain, Freeware
Summary: Testsuite results
+License: Public Domain, Freeware
Group: Development/Languages/C and C++
%description -n gcc@base_ver@-testresults
@@ -1094,6 +1083,9 @@
--enable-libstdcxx-allocator=new \
--disable-libstdcxx-pch \
--enable-version-specific-runtime-libs \
+%if 0%{suse_version} > 1100
+ --enable-linker-build-id \
+%endif
%if 0%{?gcc_target_arch:1}
%if 0%{?gcc_icecream:1}
--with-as=/opt/cross/%{TARGET_ARCH}-linux/bin/as \
@@ -1120,9 +1112,6 @@
--without-system-libunwind \
%endif
%endif
-%if 0%{suse_version} > 1100
- --enable-linker-build-id \
-%endif
%if "%{TARGET_ARCH}" == "armv5tel"
--with-arch=armv5te \
--with-float=softfp \
@@ -1180,6 +1169,7 @@
# COMMON-END
%if 0%{?building_libffi:1}
+make stage1-bubble $PARALLEL
make all-target-libffi $PARALLEL
%else
# Only run profiled bootstrap on archs where it works
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org