]>
Commit | Line | Data |
---|---|---|
8b4e6e02 | 1 | diff -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 ;;\ | |
13 | diff -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 | |
55217583 JB |
25 | --- rpm-4.4.5/lib/rpmrc.c.orig 2006-02-28 22:01:56.462419250 +0100 |
26 | +++ rpm-4.4.5/lib/rpmrc.c 2006-02-28 22:09:36.415164500 +0100 | |
27 | @@ -1331,10 +1331,18 @@ | |
28 | switch (pvr) { | |
29 | /* IBM750FX, 7410, 7450, 7451, 7441, 7455, 7445 */ | |
30 | case 0x7000: | |
31 | + strcpy(un.machine, "ppc"); | |
32 | + break; | |
33 | case 0x8000: | |
34 | case 0x8001: | |
35 | + case 0x8002: | |
36 | + case 0x8003: | |
37 | + /* 0x8000: 7450, 0x8001: 7455, 0x8002: 7457, 0x8003: 7447A */ | |
8b4e6e02 | 38 | + strcpy(un.machine, "ppc7450"); |
55217583 JB |
39 | + break; |
40 | case 0x800c: | |
41 | - strcpy(un.machine, "ppc"); | |
42 | + case 0x000c: | |
2dc15036 | 43 | + strcpy(un.machine, "ppc7400"); |
55217583 JB |
44 | break; |
45 | case 0x36: | |
46 | case 0x37: | |
8b4e6e02 | 47 | diff -ur rpm-4.4.4/macros.in rpm-4.4.4.morearchs/macros.in |
48 | --- rpm-4.4.4/macros.in 2006-02-11 15:01:38.000000000 +0000 | |
49 | +++ rpm-4.4.4.morearchs/macros.in 2006-02-11 18:17:36.000000000 +0000 | |
50 | @@ -1244,6 +1244,7 @@ | |
51 | # conditionals. | |
52 | # | |
53 | %ix86 i386 i486 i586 i686 pentium3 pentium4 athlon | |
54 | +%ppc ppc ppc7400 ppc7450 | |
55 | ||
56 | #------------------------------------------------------------------------ | |
57 | # Use in %install to generate locale specific file lists. For example, | |
58 | diff -ur rpm-4.4.4/rpmrc.in rpm-4.4.4.morearchs/rpmrc.in | |
59 | --- rpm-4.4.4/rpmrc.in 2006-02-11 15:01:38.000000000 +0000 | |
60 | +++ rpm-4.4.4.morearchs/rpmrc.in 2006-02-11 18:11:55.000000000 +0000 | |
61 | @@ -42,6 +42,8 @@ | |
62 | optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}} | |
63 | ||
64 | optflags: ppc -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} | |
65 | +optflags: ppc7400 -O2 -mcpu=7400 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} | |
66 | +optflags: ppc7450 -O2 -mcpu=7450 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} | |
67 | optflags: ppc8260 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8260: %{specflags_ppc8260}}} | |
68 | optflags: ppc8560 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8560: %{specflags_ppc8560}}} | |
69 | optflags: ppc32dy4 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc32dy4: %{specflags_ppc32dy4}}} | |
70 | @@ -110,6 +112,8 @@ | |
71 | arch_canon: mips: mips 4 | |
72 | ||
73 | arch_canon: ppc: ppc 5 | |
74 | +arch_canon: ppc7400: ppc7400 5 | |
75 | +arch_canon: ppc7450: ppc7450 5 | |
76 | arch_canon: ppc8260: ppc8260 5 | |
77 | arch_canon: ppc8560: ppc8560 5 | |
78 | arch_canon: ppc32dy4: ppc32dy4 5 | |
79 | @@ -212,7 +216,8 @@ | |
80 | buildarchtranslate: sun4u: sparc64 | |
81 | buildarchtranslate: sparc64: sparc64 | |
82 | ||
83 | -buildarchtranslate: osfmach3_ppc: ppc | |
84 | +buildarchtranslate: ppc7400: ppc7400 | |
85 | +buildarchtranslate: ppc7450: ppc7450 | |
86 | buildarchtranslate: powerpc: ppc | |
87 | buildarchtranslate: powerppc: ppc | |
88 | buildarchtranslate: ppc8260: ppc | |
89 | @@ -263,6 +268,8 @@ | |
90 | arch_compat: osfmach3_i486: i486 osfmach3_i386 | |
91 | arch_compat: osfmach3_i386: i486 | |
92 | ||
93 | +arch_compat: ppc7450: ppc7400 | |
94 | +arch_compat: ppc7400: ppc | |
95 | arch_compat: osfmach3_ppc: ppc | |
96 | arch_compat: powerpc: ppc | |
97 | arch_compat: powerppc: ppc | |
98 | @@ -375,6 +382,8 @@ | |
99 | ||
100 | buildarch_compat: m68k: noarch | |
101 | ||
102 | +buildarch_compat: ppc7450: ppc7400 | |
103 | +buildarch_compat: ppc7400: ppc | |
104 | buildarch_compat: ppc8260: noarch | |
105 | buildarch_compat: ppc8560: noarch | |
106 | buildarch_compat: ppc32dy4: noarch |