summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 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 \
7libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map 7libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map
8 8
9include_HEADERS = zconf.h zlib.h zlibdefs.h 9include_HEADERS = zconf.h zlib.h zlibdefs.h
10
11pkgconfigdir = $(libdir)/pkgconfig
12pkgconfig_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
44EOF 44EOF
45 45
46AC_CONFIG_FILES([Makefile]) 46AC_SUBST(sharedlibdir,$libdir)
47
48AC_CONFIG_FILES([
49Makefile
50zlib.pc
51])
47 52
48AC_OUTPUT 53AC_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"
7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d" 7LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
8 8
9DEPENDS = "libtool-cross" 9DEPENDS = "libtool-cross"
10PR = "r1" 10PR = "r2"
11 11
12SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \ 12SRC_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
17SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0" 17SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
18SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307" 18SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"