[oe-commits] org.oe.dev zlib: improved autotools.patch

[woglinde2 commit]

zlib: improved autotools.patch
- zlib has a .pc file now and supports pkgconfig
- the improvement was send in from Bignaux Ronan 2 years ago
- closes bug 1676
- bump PR

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: cc35bd53fa3fdf6254d53ec723aa8dd3e332fe45
ViewMTN: http://monotone.openembedded.org/revision/info/cc35bd53fa3fdf6254d53ec723aa8dd3e332fe45
Files:
1
packages/zlib/files/autotools.patch
packages/zlib/zlib_1.2.3.bb
Diffs:

#
# mt diff -rba01e413bdb728da68789e852940d3ad1043dc92 -rcc35bd53fa3fdf6254d53ec723aa8dd3e332fe45
#
#
#
# patch "packages/zlib/files/autotools.patch"
#  from [aa30fa606ad6936572b01b415cfd78a9c4c4a1c2]
#    to [4823f5063d69770f6977822ec2ae56da314cbeb8]
# 
# patch "packages/zlib/zlib_1.2.3.bb"
#  from [0b6ccd6e11fbdf058400cbec0508a55d602c4834]
#    to [29e47c464b402bc8f8366f8f3bba8bf991d595f6]
#
============================================================
--- packages/zlib/files/autotools.patch	aa30fa606ad6936572b01b415cfd78a9c4c4a1c2
+++ packages/zlib/files/autotools.patch	4823f5063d69770f6977822ec2ae56da314cbeb8
@@ -464,7 +464,7 @@ diff -Naur zlib-1.2.3/configure.ac zlib-
 diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac
 --- zlib-1.2.3/configure.ac	1970-01-01 01:00:00.000000000 +0100
 +++ zlib-1.2.3new/configure.ac	2006-08-07 20:38:31.612402750 +0200
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,17 @@
 +AC_INIT(zlib,1.2.3)
 +AC_CONFIG_SRCDIR(adler32.c)
 +AM_INIT_AUTOMAKE(zlibs,1.2.3)
@@ -476,13 +476,16 @@ diff -Naur zlib-1.2.3/configure.ac zlib-
 +
 +AC_HEADER_STDC
 +
-+AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([
++Makefile
++zlib.pc
++])
 +
 +AC_OUTPUT
 diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am
 --- 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 @@
+@@ -0,0 +1,11 @@
 +lib_LTLIBRARIES = libz.la
 +
 +libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \
@@ -491,6 +494,9 @@ diff -Naur zlib-1.2.3/Makefile.am zlib-1
 +libz_la_LDFLAGS = -version-number 1:2:3
 +
 +include_HEADERS = zconf.h zlib.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = zlib.pc
 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
@@ -649,3 +655,18 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1
 -trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
 -uncompr.o: zlib.h zconf.h
 -zutil.o: zutil.h zlib.h zconf.h
+diff -Naur zlib-1.2.3/zlib.pc.in zlib-1.2.3New/zlib.pc.in
+--- zlib-1.2.3/zlib.pc.in       1970-01-01 01:00:00.000000000 +0100
++++ zlib-1.2.3New/zlib.pc.in    2006-12-07 10:55:45.000000000 +0100
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: zlib
++Description: Standard (de)compression library
++Version: @VERSION@
++Libs: -L${libdir} -lz
++Cflags: -I${includedir}
+
============================================================
--- packages/zlib/zlib_1.2.3.bb	0b6ccd6e11fbdf058400cbec0508a55d602c4834
+++ packages/zlib/zlib_1.2.3.bb	29e47c464b402bc8f8366f8f3bba8bf991d595f6
@@ -3,7 +3,7 @@ LICENSE = "zlib"
 PRIORITY = "required"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
-PR="r2"
+PR="r3"
 
 SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
 		file://visibility.patch;patch=1 \