X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-rpmrc.patch;h=8ee579fa87e8a96ec71929b724921d47cfe17401;hb=ecbe8a50e4afaf37da412bdda6de31b72dec7e96;hp=384fc466b1631400c70559cb2a5d7dec88cf9377;hpb=78df411554b2855c1815db34265afd82d6584b72;p=packages%2Frpm.git diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch index 384fc46..8ee579f 100644 --- a/rpm-rpmrc.patch +++ b/rpm-rpmrc.patch @@ -1,58 +1,112 @@ -diff -ur rpm-3.0.1.old/rpmrc.in rpm-3.0.1/rpmrc.in ---- rpm-3.0.1.old/rpmrc.in Fri Jun 4 20:34:49 1999 -+++ rpm-3.0.1/rpmrc.in Fri Jun 4 20:36:31 1999 -@@ -4,25 +4,30 @@ - - # Please send new entries to rpm-list@redhat.com - -+# Plesae send new entries to pld-list@pld.org.pl -+ +diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in +--- rpm-4.3.org/rpmrc.in 2003-12-28 00:17:35.518360512 +0100 ++++ rpm-4.3/rpmrc.in 2003-12-28 00:25:19.224866408 +0100 +@@ -11,56 +11,58 @@ ############################################################# # Values for RPM_OPT_FLAGS for various platforms --optflags: i386 -O2 -m486 -fno-strength-reduce --optflags: alpha -O2 --optflags: sparc -O2 --optflags: sparc64 -O2 --optflags: m68k -O2 -fomit-frame-pointer --optflags: ppc -O2 -fsigned-char --optflags: parisc -O2 -mpa-risc-1-0 --optflags: hppa1.0 -O2 -mpa-risc-1-0 --optflags: hppa1.1 -O2 -mpa-risc-1-0 --optflags: hppa1.2 -O2 -mpa-risc-1-0 --optflags: hppa2.0 -O2 -mpa-risc-1-0 --optflags: mipseb -O2 --optflags: mipsel -O2 --optflags: armv4 -O2 -fsigned-char -fomit-frame-pointer --optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer --optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -+optflags: i386 -O2 -g -+optflags: i486 -O2 -g -+optflags: i586 -O2 -mpentium -g -+optflags: i686 -O2 -mpentiumpro -g -+optflags: alpha -O2 -g -+optflags: sparc -O2 -g -+optflags: sparc64 -O2 -g -+optflags: m68k -O2 -fomit-frame-pointer -g -+optflags: ppc -O2 -fsigned-char -g -+optflags: parisc -O2 -mpa-risc-1-0 -g -+optflags: hppa1.0 -O2 -mpa-risc-1-0 -g -+optflags: hppa1.1 -O2 -mpa-risc-1-0 -g -+optflags: hppa1.2 -O2 -mpa-risc-1-0 -g -+optflags: hppa2.0 -O2 -mpa-risc-1-0 -g -+optflags: mipseb -O2 -g -+optflags: mipsel -O2 -g -+optflags: armv4 -O2 -fsigned-char -fomit-frame-pointer -g -+optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -g -+optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -g +-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: athlon -O2 -g -march=athlon +-optflags: ia64 -O2 -g +-optflags: x86_64 -O2 -g +-optflags: amd64 -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: sparc -O2 -g -m32 -mtune=ultrasparc +-optflags: sparcv9 -O2 -g -m32 -mcpu=ultrasparc +-optflags: sparc64 -O2 -g -m64 -mcpu=ultrasparc +- +-optflags: m68k -O2 -g -fomit-frame-pointer +- +-optflags: ppc -O2 -g -fsigned-char +-optflags: ppciseries -O2 -g -fsigned-char +-optflags: ppcpseries -O2 -g -fsigned-char +-optflags: ppc64 -O2 -g -fsigned-char +- +-optflags: parisc -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 +-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: atarist -O2 -g -fomit-frame-pointer +-optflags: atariste -O2 -g -fomit-frame-pointer +-optflags: ataritt -O2 -g -fomit-frame-pointer +-optflags: falcon -O2 -g -fomit-frame-pointer +-optflags: atariclone -O2 -g -fomit-frame-pointer +-optflags: milan -O2 -g -fomit-frame-pointer +-optflags: hades -O2 -g -fomit-frame-pointer +- +-optflags: s390 -O2 -g +-optflags: s390x -O2 -g ++optflags: i386 -O2 -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}} ++#optflags: i386 -O2 -march=i386 -mcpu=i686 ++optflags: i486 -O2 -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}} ++optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}} ++optflags: i686 -O2 -march=i686%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}} ++optflags: athlon -O2 -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}} ++optflags: ia64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}} ++optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}} %{?specflags_amd64: %{specflags_amd64}} } ++optflags: amd64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}} %{?specflags_x86_64: %{specflags_x86_64}}} ++ ++optflags: alpha -O2 -mieee%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}} ++optflags: alphaev5 -O2 -mieee -mcpu=ev5%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev5: %{specflags_alphaev5}}} ++optflags: alphaev56 -O2 -mieee -mcpu=ev56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev56: %{specflags_alphaev56}}} ++optflags: alphapca56 -O2 -mieee -mcpu=pca56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphapca56: %{specflags_alphapca56}}} ++optflags: alphaev6 -O2 -mieee -mcpu=ev6%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev6: %{specflags_alphaev6}}} ++optflags: alphaev67 -O2 -mieee -mcpu=ev67%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev67: %{specflags_alphaev67}}} ++ ++optflags: sparc -O2 -m32 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}} ++optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv9: %{specflags_sparcv9}}} ++optflags: sparc64 -O2 -m64 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}} ++ ++optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}} ++ ++optflags: ppc -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} ++optflags: ppciseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppciseries: %{specflags_ppciseries}}} ++optflags: ppcpseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppcpseries: %{specflags_ppcpseries}}} ++optflags: ppc64 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppc64: %{specflags_ppc64}}} ++ ++optflags: parisc -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_parisc: %{specflags_parisc}}} ++optflags: hppa1.0 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_0: %{specflags_hppa1_0}}} ++optflags: hppa1.1 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_1: %{specflags_hppa1_1}}} ++optflags: hppa1.2 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_2: %{specflags_hppa1_2}}} ++optflags: hppa2.0 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa2_0: %{specflags_hppa2_0}}} ++ ++optflags: mips -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}} ++optflags: mipsel -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}%{?specflags_mipsel: %{specflags_mipsel}}} ++ ++optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv3l: %{specflags_armv3l}}} ++optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4b: %{specflags_armv4b}}} ++optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4l: %{specflags_armv4l}}} ++ ++optflags: atarist -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atarist: %{specflags_atarist}}} ++optflags: atariste -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariste: %{specflags_atariste}}} ++optflags: ataritt -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ataritt: %{specflags_ataritt}}} ++optflags: falcon -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_falcon: %{specflags_falcon}}} ++optflags: atariclone -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariclone: %{specflags_atariclone}}} ++optflags: milan -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}} ++optflags: hades -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}} ++ ++optflags: s390 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}} ++optflags: s390x -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}} ++ ############################################################# # Canonical arch names and numbers -@@ -202,6 +207,6 @@ - ############################################################# - #macrofiles: @RPMCONFIGDIR@/macros:@SYSCONFIGDIR@/macros:~/.rpmmacros - --macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros -+macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@RPMCONFIGDIR@/macros.pld:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros - - #include: @RPMCONFIGDIR@/%{_target}/rpmrc