From c6ffd92ca0fdd81f0f40125ba0f37c98414507e2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 17 2009 00:03:08 +0000 Subject: set buildarch and buildflas to match https://fedoraproject.org/wiki/Features/ArchitectureSupport --- diff --git a/redhat-rpm-config-9.0.3-F-11-Architectures.patch b/redhat-rpm-config-9.0.3-F-11-Architectures.patch new file mode 100644 index 0000000..c5b53b6 --- /dev/null +++ b/redhat-rpm-config-9.0.3-F-11-Architectures.patch @@ -0,0 +1,43 @@ +--- redhat-rpm-config-9.0.3-orig/rpmrc 2008-05-06 18:08:20.000000000 -0500 ++++ redhat-rpm-config-9.0.3/rpmrc 2009-02-16 17:56:12.001032687 -0600 +@@ -2,7 +2,7 @@ + + optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables + optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables +-optflags: i586 %{__global_cflags} -m32 -march=i586 -fasynchronous-unwind-tables ++optflags: i586 %{__global_cflags} -m32 -march=i586 -mtune=generic -fasynchronous-unwind-tables + optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables + optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables + optflags: ia64 %{__global_cflags} +@@ -18,7 +18,9 @@ + optflags: sparc %{__global_cflags} -m32 -mcpu=v7 -mtune=ultrasparc + optflags: sparcv8 %{__global_cflags} -m32 -mcpu=v8 + optflags: sparcv9 %{__global_cflags} -m32 -mcpu=ultrasparc ++optflags: sparcv9v %{__global_cflags} -m32 -mcpu=niagara + optflags: sparc64 %{__global_cflags} -m64 -mcpu=ultrasparc ++optflags: sparc64v %{__global_cflags} -m64 -mcpu=niagara + + optflags: m68k %{__global_cflags} + +@@ -56,7 +58,19 @@ + optflags: milan %{__global_cflags} + optflags: hades %{__global_cflags} + +-optflags: s390 %{__global_cflags} -m31 +-optflags: s390x %{__global_cflags} -m64 ++optflags: s390 %{__global_cflags} -m31 -march=z9-109 -mtune=z10 ++optflags: s390x %{__global_cflags} -m64 -march=z9-109 -mtune=z10 ++ ++# set build arch to fedora buildarches on hardware capable of running it ++# saves having to do rpmbuild --target= ++buildarchtranslate: athlon: i586 ++buildarchtranslate: geode: i586 ++buildarchtranslate: pentium4: i586 ++buildarchtranslate: pentium3: i586 ++buildarchtranslate: i686: i586 ++buildarchtranslate: i586: i586 ++ ++buildarchtranslate: sparcv9: sparcv9 ++buildarchtranslate: sparcv9v: sparcv9 + + macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/usr/lib/rpm/redhat/macros:/etc/rpm/macros.*:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 9087d3c..6122c8e 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,13 +1,14 @@ Summary: Red Hat specific rpm configuration files. Name: redhat-rpm-config Version: 9.0.3 -Release: 4%{?dist} +Release: 5%{?dist} # No version specified. License: GPL+ Group: Development/System Source: redhat-rpm-config-%{version}.tar.bz2 Patch0: redhat-rpm-config-9.0.3-fix-requires.patch -Patch1: limit-smp-16-threads.patch +Patch1: limit-smp-16-threads.patch +Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch BuildArch: noarch Requires: mktemp BuildRoot: %{_tmppath}/%{name}-root @@ -19,6 +20,7 @@ Red Hat specific rpm configuration files. %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 %install make DESTDIR=${RPM_BUILD_ROOT} install @@ -31,6 +33,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/lib/rpm/redhat %changelog +* Mon Feb 16 2009 Dennis Gilmore - 9.0.3-5 +- apply fedora 11 default buildflags +- set 32 bit intel build arch to i586 on compatiable hardware +- set 32 bit sparc build arch to sparcv9 on compatiable hardware + * Mon Feb 16 2009 Dennis Gilmore - 9.0.3-4 - limit _smp_flags to -j16