diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform2.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch new file mode 100644 index 0000000000..3d50e46c11 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | Fix up platform and related sysinfo file loading (part 2). | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | We need to ensure that we set the _gnu flag somehow. We do this by reading | ||
6 | from the platform file, and setting a new platform_gnu and related vars. | ||
7 | |||
8 | We then check for the existance of these things and change the configure | ||
9 | time defaults to the run-time values as necessary. | ||
10 | |||
11 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
12 | |||
13 | Index: rpm-5.4.9/lib/rpmrc.c | ||
14 | =================================================================== | ||
15 | --- rpm-5.4.9.orig/lib/rpmrc.c | ||
16 | +++ rpm-5.4.9/lib/rpmrc.c | ||
17 | @@ -487,9 +487,10 @@ static rpmRC rpmPlatform(const char * pl | ||
18 | } | ||
19 | |||
20 | if (!parseCVOG(p, &cvog) && cvog != NULL) { | ||
21 | - addMacro(NULL, "_host_cpu", NULL, cvog->cpu, -1); | ||
22 | - addMacro(NULL, "_host_vendor", NULL, cvog->vendor, -1); | ||
23 | - addMacro(NULL, "_host_os", NULL, cvog->os, -1); | ||
24 | + addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1); | ||
25 | + addMacro(NULL, "_platform_vendor", NULL, cvog->vendor, -1); | ||
26 | + addMacro(NULL, "_platform_os", NULL, cvog->os, -1); | ||
27 | + addMacro(NULL, "_platform_gnu", NULL, cvog->gnu, -1); | ||
28 | } | ||
29 | |||
30 | #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ | ||
31 | Index: rpm-5.4.9/macros/macros.in | ||
32 | =================================================================== | ||
33 | --- rpm-5.4.9.orig/macros/macros.in | ||
34 | +++ rpm-5.4.9/macros/macros.in | ||
35 | @@ -873,7 +873,7 @@ $_arbitrary_tags_tests Foo:Bar | ||
36 | %_build_arch @RPMCANONARCH@ | ||
37 | %_vendor @RPMCANONVENDOR@ | ||
38 | %_os @RPMCANONOS@ | ||
39 | -%_gnu @RPMCANONGNU@ | ||
40 | +%_gnu %{?_platform_gnu:-%{_platform_gnu}}%{!?_platform_gnu:@RPMCANONGNU@} | ||
41 | |||
42 | %_host_platform %{_host_cpu}-%{_host_vendor}-%{_host_os}%{?_gnu} | ||
43 | %_build_platform %{_build_cpu}-%{_build_vendor}-%{_build_os}%{?_gnu} | ||
44 | @@ -920,9 +920,9 @@ $_arbitrary_tags_tests Foo:Bar | ||
45 | %_build_os %{_host_os} | ||
46 | %_host @host@ | ||
47 | %_host_alias @host_alias@%{nil} | ||
48 | -%_host_cpu @host_cpu@ | ||
49 | -%_host_vendor @host_vendor@ | ||
50 | -%_host_os @host_os@ | ||
51 | +%_host_cpu %{?_platform_cpu}%{!?_platform_cpu:@host_cpu@} | ||
52 | +%_host_vendor %{?_platform_vendor}%{!?_platform_vendor:@host_vendor@} | ||
53 | +%_host_os %{?_platform_os}%{!?_platform_os:@host_os@} | ||
54 | %_target %{_host} | ||
55 | %_target_alias %{_host_alias} | ||
56 | %_target_cpu %{_host_cpu} | ||