]> git.pld-linux.org Git - packages/rpm.git/blame - rpm-morearchs.patch
projects / packages / rpm.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- obsolete
[packages/rpm.git] / rpm-morearchs.patch
CommitLineData
8b4e6e02 1diff -ur rpm-4.4.4/Makefile.am rpm-4.4.4.morearchs/Makefile.am
2--- rpm-4.4.4/Makefile.am 2006-02-11 15:01:38.000000000 +0000
3+++ rpm-4.4.4.morearchs/Makefile.am 2006-02-11 18:06:51.000000000 +0000
4@@ -188,6 +188,8 @@
5 powerpc*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc ;\
6 $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppciseries ;\
7 $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppcpseries ;\
8+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc7400 ;\
9+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc7450 ;\
10 $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64 ;\
11 $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64iseries ;\
12 $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64pseries ;;\
13diff -ur rpm-4.4.4/installplatform rpm-4.4.4.morearchs/installplatform
14--- rpm-4.4.4/installplatform 2005-10-25 21:19:24.000000000 +0000
15+++ rpm-4.4.4.morearchs/installplatform 2006-02-11 18:02:55.000000000 +0000
16@@ -33,7 +33,7 @@
17 i[3456]86|pentium[34]|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_pentium4_ s_i386_athlon_' ;;
18 alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
19 sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
20- powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
21+ powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc7400_ s_ppc\([^6ip]\|$\)_ppc7450_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
22 s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
23 *) SUBSTS=y___ ;;
24 esac
25diff -ur rpm-4.4.4/lib/rpmrc.c rpm-4.4.4.morearchs/lib/rpmrc.c
26--- rpm-4.4.4/lib/rpmrc.c 2006-02-11 15:01:38.000000000 +0000
27+++ rpm-4.4.4.morearchs/lib/rpmrc.c 2006-02-11 18:00:45.000000000 +0000
28@@ -1328,7 +1328,12 @@
29
30 if ( pvr ) {
31 pvr >>= 16;
32- if ( pvr >= 0x40)
33+ if ( (pvr & ~0x3) == 0x8000)
34+ // 0x8000: 7450, 0x8001: 7455, 0x8002: 7457, 0x8003: 7447A
35+ strcpy(un.machine, "ppc7450");
36+ else if ( pvr == 0x800C || pvr == 12 )
2dc15036 37+ strcpy(un.machine, "ppc7400");
8b4e6e02 38+ else if ( pvr >= 0x40)
39 strcpy(un.machine, "ppcpseries");
40 else if ( (pvr == 0x36) || (pvr == 0x37) )
41 strcpy(un.machine, "ppciseries");
42diff -ur rpm-4.4.4/macros.in rpm-4.4.4.morearchs/macros.in
43--- rpm-4.4.4/macros.in 2006-02-11 15:01:38.000000000 +0000
44+++ rpm-4.4.4.morearchs/macros.in 2006-02-11 18:17:36.000000000 +0000
45@@ -1244,6 +1244,7 @@
46 # conditionals.
47 #
48 %ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
49+%ppc ppc ppc7400 ppc7450
50
51 #------------------------------------------------------------------------
52 # Use in %install to generate locale specific file lists. For example,
53diff -ur rpm-4.4.4/rpmrc.in rpm-4.4.4.morearchs/rpmrc.in
54--- rpm-4.4.4/rpmrc.in 2006-02-11 15:01:38.000000000 +0000
55+++ rpm-4.4.4.morearchs/rpmrc.in 2006-02-11 18:11:55.000000000 +0000
56@@ -42,6 +42,8 @@
57 optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}}
58
59 optflags: ppc -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}}
60+optflags: ppc7400 -O2 -mcpu=7400 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}}
61+optflags: ppc7450 -O2 -mcpu=7450 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}}
62 optflags: ppc8260 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8260: %{specflags_ppc8260}}}
63 optflags: ppc8560 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8560: %{specflags_ppc8560}}}
64 optflags: ppc32dy4 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc32dy4: %{specflags_ppc32dy4}}}
65@@ -110,6 +112,8 @@
66 arch_canon: mips: mips 4
67
68 arch_canon: ppc: ppc 5
69+arch_canon: ppc7400: ppc7400 5
70+arch_canon: ppc7450: ppc7450 5
71 arch_canon: ppc8260: ppc8260 5
72 arch_canon: ppc8560: ppc8560 5
73 arch_canon: ppc32dy4: ppc32dy4 5
74@@ -212,7 +216,8 @@
75 buildarchtranslate: sun4u: sparc64
76 buildarchtranslate: sparc64: sparc64
77
78-buildarchtranslate: osfmach3_ppc: ppc
79+buildarchtranslate: ppc7400: ppc7400
80+buildarchtranslate: ppc7450: ppc7450
81 buildarchtranslate: powerpc: ppc
82 buildarchtranslate: powerppc: ppc
83 buildarchtranslate: ppc8260: ppc
84@@ -263,6 +268,8 @@
85 arch_compat: osfmach3_i486: i486 osfmach3_i386
86 arch_compat: osfmach3_i386: i486
87
88+arch_compat: ppc7450: ppc7400
89+arch_compat: ppc7400: ppc
90 arch_compat: osfmach3_ppc: ppc
91 arch_compat: powerpc: ppc
92 arch_compat: powerppc: ppc
93@@ -375,6 +382,8 @@
94
95 buildarch_compat: m68k: noarch
96
97+buildarch_compat: ppc7450: ppc7400
98+buildarch_compat: ppc7400: ppc
99 buildarch_compat: ppc8260: noarch
100 buildarch_compat: ppc8560: noarch
101 buildarch_compat: ppc32dy4: noarch
RPM Package Manager
This page took 0.03891 seconds and 4 git commands to generate.