diff --git a/redhat-rpm-config-9.1.0-arm.patch b/redhat-rpm-config-9.1.0-arm.patch new file mode 100644 index 0000000..a6b792b --- /dev/null +++ b/redhat-rpm-config-9.1.0-arm.patch @@ -0,0 +1,26 @@ +diff -uNr redhat-rpm-config-9.1.0-orig/rpmrc redhat-rpm-config-9.1.0/rpmrc +--- redhat-rpm-config-9.1.0-orig/rpmrc 2010-02-02 03:24:04.000000000 -0600 ++++ redhat-rpm-config-9.1.0/rpmrc 2011-06-13 10:40:02.000000000 -0500 +@@ -46,10 +46,12 @@ + optflags: armv4b %{__global_cflags} -fsigned-char -march=armv4 + optflags: armv4l %{__global_cflags} -fsigned-char -march=armv4 + optflags: armv4tl %{__global_cflags} -march=armv4t +-optflags: armv5tel %{__global_cflags} -march=armv5te +-optflags: armv5tejl %{__global_cflags} -march=armv5te +-optflags: armv6l %{__global_cflags} -march=armv6 +-optflags: armv7l %{__global_cflags} -march=armv7 ++optflags: armv5tel %{__global_cflags} -march=armv5te -mfloat-abi=soft ++optflags: armv5tejl %{__global_cflags} -march=armv5te -mfloat-abi=soft ++optflags: armv6l %{__global_cflags} -march=armv6 -mfloat-abi=soft ++optflags: armv7l %{__global_cflags} -march=armv7-a -mfloat-abi=soft ++optflags: armv7hl %{__global_cflags} -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard ++optflags: armv7hnl %{__global_cflags} -march=armv7-a -mfpu=neon -mfloat-abi=hard + + optflags: atarist %{__global_cflags} + optflags: atariste %{__global_cflags} +@@ -77,4 +79,5 @@ + buildarchtranslate: armv5tejl: armv5tel + buildarchtranslate: armv6l: armv5tel + buildarchtranslate: armv7l: armv5tel ++buildarchtranslate: armv7hnl: armv7hl + diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index d4e4cbd..dc14118 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,7 +1,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 7%{?dist} +Release: 8%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -17,6 +17,7 @@ Patch3: redhat-rpm-config-9.1.0-pkgconfig-private.patch # macros should not be defined here but instead in the base packages that can # be pulled in at rpm build time, this is specific for srpm creation. Patch4: redhat-rpm-config-9.1.0-arches-macros.patch +Patch5: redhat-rpm-config-9.1.0-arm.patch BuildArch: noarch Requires: mktemp Requires: rpm >= 4.6.0 @@ -33,6 +34,7 @@ Red Hat specific rpm configuration files. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -53,6 +55,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog +* Mon Jun 13 2011 Dennis Gilmore - 9.1.0-8 +- add arm hardware float macros, fix up armv7l + * Mon May 30 2011 Dennis Gilmore - 9.1.0-7 - add -srpm to the arches files so that the base language macros can be parallel installable with these