diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch new file mode 100644 index 0000000000..d99ddeb9ea --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From d82691b8d58201dd03e30585daacd8ffd1556ae2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 | ||
4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for | ||
5 | default configuration and macros. | ||
6 | |||
7 | Upstream-Status: Inappropriate [oe-core specific] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | |||
10 | --- | ||
11 | configure.ac | 2 +- | ||
12 | macros.in | 2 +- | ||
13 | rpm.am | 4 ++-- | ||
14 | 3 files changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 4f3be8770..92ffd3d68 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -875,7 +875,7 @@ else | ||
21 | usrprefix=$prefix | ||
22 | fi | ||
23 | |||
24 | -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" | ||
25 | +RPMCONFIGDIR="`echo ${libdir}/rpm`" | ||
26 | AC_SUBST(RPMCONFIGDIR) | ||
27 | |||
28 | AC_SUBST(OBJDUMP) | ||
29 | diff --git a/macros.in b/macros.in | ||
30 | index c6d5a6b03..84ae25275 100644 | ||
31 | --- a/macros.in | ||
32 | +++ b/macros.in | ||
33 | @@ -877,7 +877,7 @@ package or when debugging this package.\ | ||
34 | %_sharedstatedir %{_prefix}/com | ||
35 | %_localstatedir %{_prefix}/var | ||
36 | %_lib lib | ||
37 | -%_libdir %{_exec_prefix}/%{_lib} | ||
38 | +%_libdir @libdir@ | ||
39 | %_includedir %{_prefix}/include | ||
40 | %_infodir %{_datadir}/info | ||
41 | %_mandir %{_datadir}/man | ||
42 | diff --git a/rpm.am b/rpm.am | ||
43 | index 1f43ad8a0..6854ff6ba 100644 | ||
44 | --- a/rpm.am | ||
45 | +++ b/rpm.am | ||
46 | @@ -1,10 +1,10 @@ | ||
47 | # Internal binaries | ||
48 | ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm | ||
49 | -rpmlibexecdir = $(prefix)/lib/rpm | ||
50 | +rpmlibexecdir = $(libdir)/rpm | ||
51 | |||
52 | # Host independent config files | ||
53 | ## HACK: it probably should be $(datadir)/rpm | ||
54 | -rpmconfigdir = $(prefix)/lib/rpm | ||
55 | +rpmconfigdir = $(libdir)/rpm | ||
56 | |||
57 | # Libtool version (current-revision-age) for all our libraries | ||
58 | rpm_version_info = 7:0:0 | ||
59 | -- | ||
60 | 2.11.0 | ||
61 | |||