summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-01-22 17:31:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-10 10:47:45 +0000
commit8732930521616134e537d00a34a195a3197a5488 (patch)
tree97987f076f127c1d31ac0b6ccad20e4b67a5e851
parentddc8222443076c6d3e73d98bca595b96d409d63a (diff)
downloadpoky-8732930521616134e537d00a34a195a3197a5488.tar.gz
rpm: don't put LDFLAGS into the .pc file
The LDFLAGS are not generally useful with pkg-config and mean that the .pc file contains references to the sysroot directory, so remove it. (From OE-Core rev: f50c4c4e26edeaf01393fe7a06c42f86fd4680a5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch14
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.14.bb1
2 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch b/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch
new file mode 100644
index 0000000000..410623fab2
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/no-ldflags-in-pkgconfig.patch
@@ -0,0 +1,14 @@
1Don't put LDFLAGS into the Libs.private, all it generally contains is a linker
2hash selection (harmless) and the absolute path to the libdir in the sysroot
3(actively harmful).
4
5Upstream-Status: Pending
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/scripts/rpm.pc.in b/scripts/rpm.pc.in
9index 8293471..2ea469c 100644
10--- a/scripts/rpm.pc.in
11+++ b/scripts/rpm.pc.in
12@@ -17 +17 @@ Libs: -L${libdir} -lrpmbuild${suffix} -lrpm${suffix} -lrpmdb${suffix} -lrpmio${s
13-Libs.private: @LDFLAGS@ @LIBS@
14+Libs.private: @LIBS@
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index d99a300285..03a24f08be 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -95,6 +95,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
95 file://rpmqv_cc_b_gone.patch \ 95 file://rpmqv_cc_b_gone.patch \
96 file://rpm-realpath.patch \ 96 file://rpm-realpath.patch \
97 file://0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch \ 97 file://0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch \
98 file://no-ldflags-in-pkgconfig.patch \
98 " 99 "
99 100
100# Uncomment the following line to enable platform score debugging 101# Uncomment the following line to enable platform score debugging