summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-04-27 14:34:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-30 11:37:29 +0100
commit3ed11d61787f87c004cb40cbb126e62d1b0bed59 (patch)
treeebee5baac3c3a85dcf199faa47a60bae391e6a36
parent7670afc0ca775c9af31221e3f8ff0ef39fb4adb7 (diff)
downloadpoky-3ed11d61787f87c004cb40cbb126e62d1b0bed59.tar.gz
popt: Fixing pkgconfig file installation issue.
Install the pkgconfig files into $(libdir) instead of $(prefix)/lib/. (From OE-Core rev: 2addeb2639b798934d12d2f959dcac5a4ac697c2) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/popt/popt/pkgconfig_fix.patch15
-rw-r--r--meta/recipes-support/popt/popt_1.16.bb6
2 files changed, 19 insertions, 2 deletions
diff --git a/meta/recipes-support/popt/popt/pkgconfig_fix.patch b/meta/recipes-support/popt/popt/pkgconfig_fix.patch
new file mode 100644
index 0000000000..0bddbf8c94
--- /dev/null
+++ b/meta/recipes-support/popt/popt/pkgconfig_fix.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Pending
2
3Install the pkgconfig file into libdir.
4
5--- popt-1.16.orig/Makefile.am 2012-04-26 13:42:54.021139813 +0800
6+++ popt-1.16/Makefile.am 2012-04-26 13:36:03.552096912 +0800
7@@ -47,7 +47,7 @@
8 libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
9 libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
10
11-pkgconfigdir = $(prefix)/lib/pkgconfig
12+pkgconfigdir = $(libdir)/pkgconfig
13 pkgconfig_DATA = popt.pc
14
15 if HAVE_LD_VERSION_SCRIPT
diff --git a/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index fa6c3268de..cd22e9a77c 100644
--- a/meta/recipes-support/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
@@ -4,9 +4,11 @@ SECTION = "libs"
4 4
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" 6LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
7PR = "r0" 7PR = "r1"
8 8
9SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" 9SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
10 file://pkgconfig_fix.patch \
11 "
10 12
11SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" 13SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"
12SRC_URI[sha256sum] = "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8" 14SRC_URI[sha256sum] = "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8"