summaryrefslogtreecommitdiff
path: root/packaging/optflags.patch
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2012-06-21 16:56:56 +0100
committerGraydon, Tracy <tracy.graydon@intel.com>2013-01-17 12:36:20 -0800
commit2512f764eb7163927f02cbaac952fae910970c89 (patch)
tree362fc43bece63f63049f6b5385bc4935f5d27f08 /packaging/optflags.patch
parentbaa9daa099c33b3b2e0137d77d93026ddbbfa23c (diff)
downloadrpm-2512f764eb7163927f02cbaac952fae910970c89.tar.gz
rpm-2512f764eb7163927f02cbaac952fae910970c89.tar.bz2
rpm-2512f764eb7163927f02cbaac952fae910970c89.zip
Remove the crufty header stuff I missed in the spec
Diffstat (limited to 'packaging/optflags.patch')
-rw-r--r--packaging/optflags.patch37
1 files changed, 24 insertions, 13 deletions
diff --git a/packaging/optflags.patch b/packaging/optflags.patch
index eb90e94..d38ed6d 100644
--- a/packaging/optflags.patch
+++ b/packaging/optflags.patch
@@ -1,7 +1,7 @@
-Index: rpm-4.9.0/rpmrc.in
+Index: rpm-4.9.1/rpmrc.in
===================================================================
---- rpm-4.9.0.orig/rpmrc.in
-+++ rpm-4.9.0/rpmrc.in
+--- rpm-4.9.1.orig/rpmrc.in
++++ rpm-4.9.1/rpmrc.in
@@ -12,10 +12,10 @@
# "fat" binary with both archs, for Darwin
optflags: fat -O2 -g -arch i386 -arch ppc
@@ -49,18 +49,29 @@ Index: rpm-4.9.0/rpmrc.in
optflags: atarist -O2 -g -fomit-frame-pointer
optflags: atariste -O2 -g -fomit-frame-pointer
-@@ -218,10 +219,10 @@ buildarchtranslate: athlon: i386
- buildarchtranslate: geode: i386
- buildarchtranslate: pentium4: i386
- buildarchtranslate: pentium3: i386
+@@ -209,17 +210,17 @@ os_canon: MacOSX: macosx 21
+ #############################################################
+ # For a given uname().machine, the default build arch
+
+-buildarchtranslate: osfmach3_i686: i386
+-buildarchtranslate: osfmach3_i586: i386
++buildarchtranslate: osfmach3_i686: i586
++buildarchtranslate: osfmach3_i586: i586
+ buildarchtranslate: osfmach3_i486: i386
+ buildarchtranslate: osfmach3_i386: i386
+
+-buildarchtranslate: athlon: i386
+-buildarchtranslate: geode: i386
+-buildarchtranslate: pentium4: i386
+-buildarchtranslate: pentium3: i386
-buildarchtranslate: i686: i386
-buildarchtranslate: i586: i386
--buildarchtranslate: i486: i386
--buildarchtranslate: i386: i386
++buildarchtranslate: athlon: i586
++buildarchtranslate: geode: i586
++buildarchtranslate: pentium4: i586
++buildarchtranslate: pentium3: i586
+buildarchtranslate: i686: i586
+buildarchtranslate: i586: i586
-+buildarchtranslate: i486: i586
-+buildarchtranslate: i386: i586
+ buildarchtranslate: i486: i386
+ buildarchtranslate: i386: i386
- buildarchtranslate: alphaev5: alpha
- buildarchtranslate: alphaev56: alpha