182 lines
7.3 KiB
Diff
182 lines
7.3 KiB
Diff
SUSE specific rpmrc changes.
|
|
|
|
Index: rpmrc.in
|
|
===================================================================
|
|
--- rpmrc.in.orig
|
|
+++ rpmrc.in
|
|
@@ -15,16 +15,16 @@
|
|
# "fat" binary with both archs, for Darwin
|
|
optflags: fat -O2 -g -arch i386 -arch ppc
|
|
|
|
-optflags: i386 -O2 -g -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
|
|
-optflags: i486 -O2 -g -m32 -march=i486 -fasynchronous-unwind-tables
|
|
-optflags: i586 -O2 -g -m32 -march=i586 -fasynchronous-unwind-tables
|
|
-optflags: i686 -O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
|
|
-optflags: pentium3 -O2 -g -m32 -march=pentium3 -mtune=generic -fasynchronous-unwind-tables
|
|
-optflags: pentium4 -O2 -g -m32 -march=pentium4 -mtune=generic -fasynchronous-unwind-tables
|
|
-optflags: athlon -O2 -g -m32 -march=athlon -fasynchronous-unwind-tables
|
|
+optflags: i386 -O2 -g -m32 -march=i486 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
+optflags: i486 -O2 -g -m32 -march=i486 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
+optflags: i586 -O2 -g -m32 -march=i586 -mtune=i686 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
+optflags: i686 -O2 -g -m32 -march=i686 -mtune=i686 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
+optflags: pentium3 -O2 -g -m32 -march=pentium3
|
|
+optflags: pentium4 -O2 -g -m32 -march=pentium4
|
|
+optflags: athlon -O2 -g -m32 -march=athlon
|
|
optflags: geode -Os -g -m32 -march=geode
|
|
-optflags: ia64 -O2 -g -m64 -mtune=generic
|
|
-optflags: x86_64 -O2 -g -m64 -mtune=generic
|
|
+optflags: ia64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
+optflags: x86_64 -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
optflags: amd64 -O2 -g -mtune=generic
|
|
optflags: ia32e -O2 -g -m64 -mtune=generic
|
|
|
|
@@ -44,15 +44,16 @@ optflags: sparc64v -O2 -g -m64 -march=ni
|
|
|
|
optflags: m68k -O2 -g -fomit-frame-pointer
|
|
|
|
-optflags: ppc -O2 -g -m32 -fsigned-char
|
|
-optflags: ppc8260 -O2 -g -m32 -fsigned-char
|
|
-optflags: ppc8560 -O2 -g -m32 -fsigned-char
|
|
-optflags: ppc32dy4 -O2 -g -m32 -fsigned-char
|
|
-optflags: ppciseries -O2 -g -m32 -fsigned-char
|
|
-optflags: ppcpseries -O2 -g -m32 -fsigned-char
|
|
-optflags: ppc64 -O2 -g -m64 -fsigned-char
|
|
+optflags: ppc -O2 -g -m32 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
+optflags: ppc8260 -O2 -g -m32
|
|
+optflags: ppc8560 -O2 -g -m32
|
|
+optflags: ppc32dy4 -O2 -g -m32
|
|
+optflags: ppciseries -O2 -g -m32
|
|
+optflags: ppcpseries -O2 -g -m32
|
|
+optflags: ppc64 -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
|
|
optflags: parisc -O2 -g -mpa-risc-1-0
|
|
+optflags: hppa -O2 -g -mpa-risc-1-0
|
|
optflags: hppa1.0 -O2 -g -mpa-risc-1-0
|
|
optflags: hppa1.1 -O2 -g -mpa-risc-1-0
|
|
optflags: hppa1.2 -O2 -g -mpa-risc-1-0
|
|
@@ -77,8 +78,8 @@ optflags: atariclone -O2 -g -fomit-frame
|
|
optflags: milan -O2 -g -fomit-frame-pointer
|
|
optflags: hades -O2 -g -fomit-frame-pointer
|
|
|
|
-optflags: s390 -O2 -g -m31
|
|
-optflags: s390x -O2 -g -m64
|
|
+optflags: s390 -O2 -g -m31 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
+optflags: s390x -O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
|
|
|
|
optflags: sh3 -O2 -g
|
|
optflags: sh4 -O2 -g
|
|
@@ -201,17 +202,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: athlon: i586
|
|
+buildarchtranslate: geode: i586
|
|
+buildarchtranslate: pentium4: i586
|
|
+buildarchtranslate: pentium3: i586
|
|
+buildarchtranslate: i686: i586
|
|
+buildarchtranslate: i586: i586
|
|
buildarchtranslate: i486: i386
|
|
buildarchtranslate: i386: i386
|
|
|
|
@@ -240,6 +241,7 @@ buildarchtranslate: ppciseries: ppc
|
|
buildarchtranslate: ppcpseries: ppc
|
|
buildarchtranslate: ppc64iseries: ppc64
|
|
buildarchtranslate: ppc64pseries: ppc64
|
|
+buildarchtranslate: powerpc64: ppc64
|
|
|
|
buildarchtranslate: armv3l: armv3l
|
|
buildarchtranslate: armv4b: armv4b
|
|
@@ -270,6 +272,15 @@ buildarchtranslate: sh3: sh3
|
|
buildarchtranslate: sh4: sh4
|
|
buildarchtranslate: sh4a: sh4
|
|
|
|
+buildarchtranslate: parisc: hppa
|
|
+buildarchtranslate: hppa2.0: hppa
|
|
+buildarchtranslate: hppa64: hppa
|
|
+
|
|
+buildarchtranslate: armv5l: armv4l
|
|
+buildarchtranslate: armv5tel: armv4l
|
|
+buildarchtranslate: armv5b: armv4b
|
|
+buildarchtranslate: armv5teb: armv4b
|
|
+
|
|
#############################################################
|
|
# Architecture compatibility
|
|
|
|
@@ -326,12 +337,16 @@ arch_compat: hppa2.0: hppa1.2
|
|
arch_compat: hppa1.2: hppa1.1
|
|
arch_compat: hppa1.1: hppa1.0
|
|
arch_compat: hppa1.0: parisc
|
|
-arch_compat: parisc: noarch
|
|
+arch_compat: hppa1.0: hppa
|
|
+arch_compat: hppa: noarch
|
|
|
|
+arch_compat: armv5teb: armv5b
|
|
+arch_compat: armv5b: armv4b
|
|
arch_compat: armv4b: noarch
|
|
arch_compat: armv6l: armv5tejl
|
|
arch_compat: armv5tejl: armv5tel
|
|
-arch_compat: armv5tel: armv4tl
|
|
+arch_compat: armv5tel: armv5l
|
|
+arch_compat: armv5l: armv4tl
|
|
arch_compat: armv4tl: armv4l
|
|
arch_compat: armv4l: armv3l
|
|
arch_compat: armv3l: noarch
|
|
@@ -348,9 +363,9 @@ arch_compat: i370: noarch
|
|
arch_compat: s390: noarch
|
|
arch_compat: s390x: s390 noarch
|
|
|
|
-arch_compat: ia64: noarch
|
|
+arch_compat: ia64: i686 noarch
|
|
|
|
-arch_compat: x86_64: amd64 athlon noarch
|
|
+arch_compat: x86_64: amd64 em64t athlon noarch
|
|
arch_compat: amd64: x86_64 athlon noarch
|
|
arch_compat: ia32e: x86_64 athlon noarch
|
|
|
|
@@ -431,10 +446,12 @@ buildarch_compat: ppc64iseries: ppc64
|
|
buildarch_compat: mips: noarch
|
|
buildarch_compat: mipsel: noarch
|
|
|
|
+buildarch_compat: armv5b: noarch
|
|
buildarch_compat: armv4b: noarch
|
|
buildarch_compat: armv6l: armv5tejl
|
|
buildarch_compat: armv5tejl: armv5tel
|
|
-buildarch_compat: armv5tel: armv4tl
|
|
+buildarch_compat: armv5tel: armv5l
|
|
+buildarch_compat: armv5l: armv4tl
|
|
buildarch_compat: armv4tl: armv4l
|
|
buildarch_compat: armv4l: armv3l
|
|
buildarch_compat: armv3l: noarch
|
|
@@ -442,7 +459,8 @@ buildarch_compat: armv3l: noarch
|
|
buildarch_compat: hppa2.0: hppa1.2
|
|
buildarch_compat: hppa1.2: hppa1.1
|
|
buildarch_compat: hppa1.1: hppa1.0
|
|
-buildarch_compat: hppa1.0: parisc
|
|
+buildarch_compat: hppa1.0: hppa
|
|
+buildarch_compat: hppa: parisc
|
|
buildarch_compat: parisc: noarch
|
|
|
|
buildarch_compat: atarist: m68kmint noarch
|
|
@@ -466,7 +484,7 @@ buildarch_compat: sh3: noarch
|
|
buildarch_compat: sh4: noarch
|
|
buildarch_compat: sh4a: sh4
|
|
|
|
-macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.*:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
|
|
+macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@RPMCONFIGDIR@/suse_macros:@SYSCONFIGDIR@/macros.*:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
|
|
|
|
# \endverbatim
|
|
#*/
|