aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-05-08 12:36:17 -0700
committerJoshua Lock <josh@linux.intel.com>2012-05-21 22:14:42 -0700
commit37fbe2e1a706af634f400213b9fb4c6f0670c15e (patch)
tree78e4f26ecbe4201ef79ab14b0fcf34435b1947e7
parentf35902844c5c1de06c9a1b2111abf0d8b5687a9b (diff)
downloadopenembedded-core-37fbe2e1a706af634f400213b9fb4c6f0670c15e.zip
openembedded-core-37fbe2e1a706af634f400213b9fb4c6f0670c15e.tar.gz
openembedded-core-37fbe2e1a706af634f400213b9fb4c6f0670c15e.tar.bz2
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> Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/recipes-core/zlib/files/Makefile.am3
-rw-r--r--meta/recipes-core/zlib/files/configure.ac7
-rw-r--r--meta/recipes-core/zlib/zlib_1.2.5.bb4
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 b66d299..db072df 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 \
libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map
include_HEADERS = zconf.h zlib.h zlibdefs.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = zlib.pc
diff --git a/meta/recipes-core/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac
index 4761b7e..5792b15 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
#endif
EOF
-AC_CONFIG_FILES([Makefile])
+AC_SUBST(sharedlibdir,$libdir)
+
+AC_CONFIG_FILES([
+Makefile
+zlib.pc
+])
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 bca400c..14b3987 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"
LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
DEPENDS = "libtool-cross"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
file://configure.ac \
file://Makefile.am \
- file://fix.inverted.LFS.logic.patch"
+ file://fix.inverted.LFS.logic.patch"
SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"