]>
Commit | Line | Data |
---|---|---|
a438db47 AM |
1 | Index: macros.in |
2 | =================================================================== | |
3 | RCS file: /cvs/devel/rpm/macros.in,v | |
4 | retrieving revision 1.154.2.61 | |
5 | diff -u -b -B -w -p -r1.154.2.61 macros.in | |
6 | --- macros.in 3 Feb 2007 20:02:07 -0000 1.154.2.61 | |
7 | +++ macros.in 4 Feb 2007 06:37:17 -0000 | |
8 | @@ -928,7 +928,10 @@ print (t)\ | |
9 | %_vendor @RPMCANONVENDOR@ | |
10 | %_os @RPMCANONOS@ | |
11 | %_gnu -gnu | |
12 | -%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu} | |
13 | + | |
0ead2e9a AM |
14 | + |
15 | + | |
a438db47 AM |
16 | +%_target_platform %{_target_cpu}-%{_target_vendor}-%{_target_os}%{?_gnu} |
17 | ||
18 | # | |
19 | # Define a generic value for optflags. Normally overridden by per-target macros. | |
20 | Index: lib/rpmrc.c | |
21 | =================================================================== | |
22 | RCS file: /cvs/devel/rpm/lib/rpmrc.c,v | |
23 | retrieving revision 2.193.2.27 | |
24 | diff -u -b -B -w -p -r2.193.2.27 rpmrc.c | |
25 | --- lib/rpmrc.c 21 Jan 2007 21:11:46 -0000 2.193.2.27 | |
26 | +++ lib/rpmrc.c 4 Feb 2007 06:37:30 -0000 | |
27 | @@ -1774,8 +1774,6 @@ static void rpmRebuildTargetVars(const c | |
28 | addMacro(NULL, "_target", NULL, ct, RMIL_RPMRC); | |
29 | delMacro(NULL, "_target_cpu"); | |
30 | addMacro(NULL, "_target_cpu", NULL, ca, RMIL_RPMRC); | |
31 | - delMacro(NULL, "_target_vendor"); | |
32 | - addMacro(NULL, "_target_vendor", NULL, "unknown", RMIL_RPMRC); | |
33 | delMacro(NULL, "_target_os"); | |
34 | addMacro(NULL, "_target_os", NULL, co, RMIL_RPMRC); | |
35 | /* |