diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-06-21 16:56:56 +0100 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2012-06-22 16:30:11 +0100 |
| commit | 6863478fddde08f15ef1368267a9f52d1b3e1ada (patch) | |
| tree | 6325f3faf8bf397f5869947ed2bf71341e7cc258 /packaging/optflags.patch | |
| parent | dd9dc00ea863b82d2d8fcebdb8918ca37a45ca2b (diff) | |
| download | rpm-6863478fddde08f15ef1368267a9f52d1b3e1ada.tar.gz rpm-6863478fddde08f15ef1368267a9f52d1b3e1ada.tar.bz2 rpm-6863478fddde08f15ef1368267a9f52d1b3e1ada.zip | |
fixed optflags and perl auto-dependencies
- disable perl auto requires, this has been annoying and pulling perl on
every perl script in any package
- Fixed architecture translations to allow building with correct
architectures by default
Change-Id: Ifc37c05237daa6e8efa0c12849efa6f4cfa6d3b8
Diffstat (limited to 'packaging/optflags.patch')
| -rw-r--r-- | packaging/optflags.patch | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/packaging/optflags.patch b/packaging/optflags.patch index a882a98..ac89f49 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 |