SUSE specific rpmrc changes. Index: rpmrc.in =================================================================== --- rpmrc.in.orig +++ rpmrc.in @@ -15,41 +15,42 @@ # "fat" binary with both archs, for Darwin optflags: fat -O2 -g -arch i386 -arch ppc -optflags: i386 -O2 -g -march=i386 -mcpu=i686 -optflags: i486 -O2 -g -march=i486 -optflags: i586 -O2 -g -march=i586 -optflags: i686 -O2 -g -march=i686 +optflags: i386 -O2 -g -m32 -march=i486 -fmessage-length=0 -D_FORTIFY_SOURCE=2 +optflags: i486 -O2 -g -m32 -march=i486 +optflags: i586 -O2 -g -m32 -march=i586 -mtune=i686 -fmessage-length=0 -D_FORTIFY_SOURCE=2 +optflags: i686 -O2 -g -m32 -march=i686 -mtune=i686 -fmessage-length=0 -D_FORTIFY_SOURCE=2 optflags: pentium3 -O2 -g -march=pentium3 optflags: pentium4 -O2 -g -march=pentium4 optflags: athlon -O2 -g -march=athlon -optflags: ia64 -O2 -g -optflags: x86_64 -O2 -g +optflags: ia64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 +optflags: x86_64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 optflags: amd64 -O2 -g optflags: ia32e -O2 -g optflags: alpha -O2 -g -mieee -optflags: alphaev5 -O2 -g -mieee -mcpu=ev5 -optflags: alphaev56 -O2 -g -mieee -mcpu=ev56 -optflags: alphapca56 -O2 -g -mieee -mcpu=pca56 -optflags: alphaev6 -O2 -g -mieee -mcpu=ev6 -optflags: alphaev67 -O2 -g -mieee -mcpu=ev67 +optflags: alphaev5 -O2 -g -mieee -mtune=ev5 +optflags: alphaev56 -O2 -g -mieee -mtune=ev56 +optflags: alphapca56 -O2 -g -mieee -mtune=pca56 +optflags: alphaev6 -O2 -g -mieee -mtune=ev6 +optflags: alphaev67 -O2 -g -mieee -mtune=ev67 optflags: sparc -O2 -g -m32 -mtune=ultrasparc optflags: sparcv8 -O2 -g -m32 -mtune=ultrasparc -mv8 -optflags: sparcv9 -O2 -g -m32 -mcpu=ultrasparc -optflags: sparc64 -O2 -g -m64 -mcpu=ultrasparc +optflags: sparcv9 -O2 -g -m32 -mtune=ultrasparc +optflags: sparc64 -O2 -g -m64 -mtune=ultrasparc optflags: m68k -O2 -g -fomit-frame-pointer -optflags: ppc -O2 -g -fsigned-char -optflags: ppc8260 -O2 -g -fsigned-char -optflags: ppc8560 -O2 -g -fsigned-char -optflags: ppc32dy4 -O2 -g -fsigned-char -optflags: ppciseries -O2 -g -fsigned-char -optflags: ppcpseries -O2 -g -fsigned-char -optflags: ppc64 -O2 -g -fsigned-char +optflags: ppc -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 +optflags: ppc8260 -O2 -g +optflags: ppc8560 -O2 -g +optflags: ppc32dy4 -O2 -g +optflags: ppciseries -O2 -g +optflags: ppcpseries -O2 -g +optflags: ppc64 -O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 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 @@ -58,9 +59,9 @@ optflags: hppa2.0 -O2 -g -mpa-risc-1-0 optflags: mips -O2 -g optflags: mipsel -O2 -g -optflags: armv3l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv3 -optflags: armv4b -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4 -optflags: armv4l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4 +optflags: armv3l -O2 -g -march=armv3 +optflags: armv4b -O2 -g -march=armv4 +optflags: armv4l -O2 -g -march=armv4 optflags: atarist -O2 -g -fomit-frame-pointer optflags: atariste -O2 -g -fomit-frame-pointer @@ -70,8 +71,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 -optflags: s390x -O2 -g +optflags: s390 -O2 -g -fmessage-length=0 +optflags: s390x -O2 -g -fmessage-length=0 ############################################################# # Canonical arch names and numbers @@ -181,16 +182,16 @@ 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: pentium4: i386 -buildarchtranslate: pentium3: i386 -buildarchtranslate: i686: i386 -buildarchtranslate: i586: i386 +buildarchtranslate: athlon: i586 +buildarchtranslate: pentium4: i586 +buildarchtranslate: pentium3: i586 +buildarchtranslate: i686: i586 +buildarchtranslate: i586: i586 buildarchtranslate: i486: i386 buildarchtranslate: i386: i386 @@ -217,6 +218,7 @@ buildarchtranslate: ppciseries: ppc buildarchtranslate: ppcpseries: ppc buildarchtranslate: ppc64iseries: ppc64 buildarchtranslate: ppc64pseries: ppc64 +buildarchtranslate: powerpc64: ppc64 buildarchtranslate: atarist: m68kmint buildarchtranslate: atariste: m68kmint @@ -235,6 +237,15 @@ buildarchtranslate: x86_64: x86_64 buildarchtranslate: amd64: x86_64 buildarchtranslate: ia32e: x86_64 +buildarchtranslate: parisc: hppa +buildarchtranslate: hppa2.0: hppa +buildarchtranslate: hppa64: hppa + +buildarchtranslate: armv5l: armv4l +buildarchtranslate: armv5tel: armv4l +buildarchtranslate: armv5b: armv4b +buildarchtranslate: armv5teb: armv4b + ############################################################# # Architecture compatibility @@ -287,10 +298,16 @@ arch_compat: mipsel: noarch 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: hppa1.0: hppa +arch_compat: hppa: parisc arch_compat: parisc: noarch +arch_compat: armv5teb: armv5b +arch_compat: armv5b: armv4b arch_compat: armv4b: noarch + +arch_compat: armv5tel: armv5l +arch_compat: armv5l: armv4l arch_compat: armv4l: armv3l arch_compat: armv3l: noarch @@ -306,9 +323,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 @@ -384,11 +401,16 @@ buildarch_compat: mipsel: noarch buildarch_compat: armv3l: noarch buildarch_compat: armv4b: noarch buildarch_compat: armv4l: noarch +buildarch_compat: armv5b: noarch +buildarch_compat: armv5l: noarch +buildarch_compat: armv5teb: noarch +buildarch_compat: armv5tel: 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 @@ -408,7 +430,7 @@ buildarch_compat: x86_64: noarch buildarch_compat: amd64: x86_64 buildarch_compat: ia32e: x86_64 -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 #*/