aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2006-10-14 05:47:28 +0000
committerJamie Lenehan <lenehan@twibble.org>2006-10-14 05:47:28 +0000
commit006c0fedaca1fa3409122384b1749ae3f37177f7 (patch)
treef2a4fade1fd2e7ce36f49c032faf7e8e41b1b8c0 /packages
parente093c8f4c2ecc7b514b7f5521e3c3de170b7a4d5 (diff)
downloadopenembedded-006c0fedaca1fa3409122384b1749ae3f37177f7.tar.gz
zlib 1.2.3: Include zlib.h and zconf.h in the zlib-dev package by
listing the headers to be installed in Makefile.am (so autoconf installs them correctly). Closes #1469.
Diffstat (limited to 'packages')
-rw-r--r--packages/zlib/zlib-1.2.3/autotools.patch8
-rw-r--r--packages/zlib/zlib_1.2.3.bb2
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/zlib/zlib-1.2.3/autotools.patch b/packages/zlib/zlib-1.2.3/autotools.patch
index 722a20d499..d1dc8dd8d4 100644
--- a/packages/zlib/zlib-1.2.3/autotools.patch
+++ b/packages/zlib/zlib-1.2.3/autotools.patch
@@ -480,15 +480,17 @@ diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac
+
+AC_OUTPUT
diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am
---- zlib-1.2.3/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ zlib-1.2.3new/Makefile.am 2006-08-07 19:57:26.522344250 +0200
-@@ -0,0 +1,6 @@
+--- zlib-1.2.3/Makefile.am 2006/10/14 05:35:40 1.1
++++ zlib-1.2.3new/Makefile.am 2006/10/14 05:36:49
+@@ -0,0 +1,8 @@
+lib_LTLIBRARIES = libz.la
+
+libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \
+ trees.c zutil.c inflate.c infback.c inftrees.c inffast.c
+
+libz_la_LDFLAGS = -version-number 1:2:3
++
++include_HEADERS = zconf.h zlib.h
diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in
--- zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200
+++ zlib-1.2.3new/Makefile.in 1970-01-01 01:00:00.000000000 +0100
diff --git a/packages/zlib/zlib_1.2.3.bb b/packages/zlib/zlib_1.2.3.bb
index 571f7b5e08..629ee83efb 100644
--- a/packages/zlib/zlib_1.2.3.bb
+++ b/packages/zlib/zlib_1.2.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
PRIORITY = "required"
HOMEPAGE = "http://www.gzip.org/zlib/"
LICENSE = "zlib"
-PR="r1"
+PR="r2"
SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
file://visibility.patch;patch=1 \