diff options
author | Joshua Lock <josh@linux.intel.com> | 2012-05-08 12:36:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-31 21:11:46 +0100 |
commit | ac63b3f8ef90b018aaea1bf1c9a9a42bd2be39a7 (patch) | |
tree | 169b6d37fc30bc8261de41e4723c5ab6d0aada86 /meta/recipes-core | |
parent | 4039b5b97ceb6a67a3ef65b546b9be8cf8cd8179 (diff) | |
download | poky-ac63b3f8ef90b018aaea1bf1c9a9a42bd2be39a7.tar.gz |
zlib: install pc file
Joshua Immanuel reported, and provided a patch to fix, that our custom
autotooling for zlib does not install the pc file.
Fixes [YOCTO #1983]
Patch-from: Joshua Immanuel <josh@hipro.co.in>
(From OE-Core rev: 37fbe2e1a706af634f400213b9fb4c6f0670c15e)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/zlib/files/Makefile.am | 3 | ||||
-rw-r--r-- | meta/recipes-core/zlib/files/configure.ac | 7 | ||||
-rw-r--r-- | meta/recipes-core/zlib/zlib_1.2.5.bb | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/meta/recipes-core/zlib/files/Makefile.am b/meta/recipes-core/zlib/files/Makefile.am index b66d299d8f..db072dfe4a 100644 --- a/meta/recipes-core/zlib/files/Makefile.am +++ b/meta/recipes-core/zlib/files/Makefile.am | |||
@@ -7,3 +7,6 @@ libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c gzclose.c gzread.c \ | |||
7 | libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map | 7 | libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map |
8 | 8 | ||
9 | include_HEADERS = zconf.h zlib.h zlibdefs.h | 9 | include_HEADERS = zconf.h zlib.h zlibdefs.h |
10 | |||
11 | pkgconfigdir = $(libdir)/pkgconfig | ||
12 | pkgconfig_DATA = zlib.pc | ||
diff --git a/meta/recipes-core/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac index 4761b7ef28..5792b15103 100644 --- a/meta/recipes-core/zlib/files/configure.ac +++ b/meta/recipes-core/zlib/files/configure.ac | |||
@@ -43,6 +43,11 @@ cat > zlibdefs.h << EOF | |||
43 | #endif | 43 | #endif |
44 | EOF | 44 | EOF |
45 | 45 | ||
46 | AC_CONFIG_FILES([Makefile]) | 46 | AC_SUBST(sharedlibdir,$libdir) |
47 | |||
48 | AC_CONFIG_FILES([ | ||
49 | Makefile | ||
50 | zlib.pc | ||
51 | ]) | ||
47 | 52 | ||
48 | AC_OUTPUT | 53 | AC_OUTPUT |
diff --git a/meta/recipes-core/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb index bca400ce4b..14b3987078 100644 --- a/meta/recipes-core/zlib/zlib_1.2.5.bb +++ b/meta/recipes-core/zlib/zlib_1.2.5.bb | |||
@@ -7,12 +7,12 @@ LICENSE = "Zlib" | |||
7 | LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d" | 7 | LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d" |
8 | 8 | ||
9 | DEPENDS = "libtool-cross" | 9 | DEPENDS = "libtool-cross" |
10 | PR = "r1" | 10 | PR = "r2" |
11 | 11 | ||
12 | SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \ |
13 | file://configure.ac \ | 13 | file://configure.ac \ |
14 | file://Makefile.am \ | 14 | file://Makefile.am \ |
15 | file://fix.inverted.LFS.logic.patch" | 15 | file://fix.inverted.LFS.logic.patch" |
16 | 16 | ||
17 | SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0" | 17 | SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0" |
18 | SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307" | 18 | SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307" |