diff options
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/popt/popt/pkgconfig_fix.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-support/popt/popt_1.16.bb | 6 |
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 000000000..0bddbf8c9 --- /dev/null +++ b/meta/recipes-support/popt/popt/pkgconfig_fix.patch @@ -0,0 +1,15 @@ +Upstream-Status: Pending + +Install the pkgconfig file into libdir. + +--- popt-1.16.orig/Makefile.am 2012-04-26 13:42:54.021139813 +0800 ++++ popt-1.16/Makefile.am 2012-04-26 13:36:03.552096912 +0800 +@@ -47,7 +47,7 @@ + libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c + libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ + +-pkgconfigdir = $(prefix)/lib/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = popt.pc + + 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 fa6c3268d..cd22e9a77 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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" -PR = "r0" +PR = "r1" -SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" +SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \ + file://pkgconfig_fix.patch \ + " SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" SRC_URI[sha256sum] = "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8" |