[ptxdist] [PATCH] zlib: Bump version to 1.2.7

[ptxdist] [PATCH] zlib: Bump version to 1.2.7

[Bernhard Walle]

As usual with zlib, the archive of the old version isn't available on
the same location any more, so it would be nice if the update could make
it to 2012.04.

Also remove the old patches that are not needed any more.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 .../0001-install-fix-for-static-only.patch         |   34 --------------------
 ...ink-the-shared-lib-against-the-static-lib.patch |   24 --------------
 patches/zlib-1.2.5/series                          |    4 ---
 rules/zlib.make                                    |    4 +--
 4 Dateien geändert, 2 Zeilen hinzugefügt(+), 64 Zeilen entfernt(-)
 delete mode 100644 patches/zlib-1.2.5/0001-install-fix-for-static-only.patch
 delete mode 100644 patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch
 delete mode 100644 patches/zlib-1.2.5/series

diff --git a/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch b/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch
deleted file mode 100644
index 57aa122..0000000
--- a/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 5 Jul 2010 22:51:51 +0200
-Subject: [PATCH] install: fix for static only
-
-"make install" tries to install the shared lib even if only
-the static lib is compiled. This patch makes installing the
-shared lib conditional.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.in |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 5b15bd0..82639e6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -168,10 +168,11 @@ install-libs: $(LIBS)
- 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- 	cp $(STATICLIB) $(DESTDIR)$(libdir)
--	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
- 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
- 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
--	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
-+	-@if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
-+	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
-+	  cd $(DESTDIR)$(sharedlibdir); \
- 	  chmod 755 $(SHAREDLIBV); \
- 	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
- 	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
--- 
-1.7.1
-
diff --git a/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch b/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch
deleted file mode 100644
index 71f90ed..0000000
--- a/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 15 Jul 2010 14:50:27 +0200
-Subject: [PATCH] don't link the shared lib against the static lib
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- configure |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index bd9edd2..e6c2ead 100755
---- a/configure
-+++ b/configure
-@@ -19,7 +19,6 @@ if [ -n "${CHOST}" ]; then
- fi
- 
- STATICLIB=libz.a
--LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"
- VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
- VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
- VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
--- 
-1.7.1
-
diff --git a/patches/zlib-1.2.5/series b/patches/zlib-1.2.5/series
deleted file mode 100644
index 3ba4f26..0000000
--- a/patches/zlib-1.2.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-0001-install-fix-for-static-only.patch
-0002-don-t-link-the-shared-lib-against-the-static-lib.patch
-# e8400e7168293e2c816fd639c49ee4ce  - git-ptx-patches magic
diff --git a/rules/zlib.make b/rules/zlib.make
index 2c15ccb..35467e1 100644
--- a/rules/zlib.make
+++ b/rules/zlib.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_ZLIB) += zlib
 #
 # Paths and names
 #
-ZLIB_VERSION	:= 1.2.6
-ZLIB_MD5	:= dc2cfa0d2313ca77224b4d932b2911e9
+ZLIB_VERSION	:= 1.2.7
+ZLIB_MD5	:= 2ab442d169156f34c379c968f3f482dd
 ZLIB		:= zlib-$(ZLIB_VERSION)
 ZLIB_SUFFIX	:= tar.bz2
 ZLIB_URL	:= http://zlib.net/$(ZLIB).$(ZLIB_SUFFIX)
-- 
1.7.10.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] zlib: Bump version to 1.2.7

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 601 bytes --]

On 05/03/2012 09:35 PM, Bernhard Walle wrote:
> As usual with zlib, the archive of the old version isn't available on
> the same location any more, so it would be nice if the update could make
> it to 2012.04.
> 
> Also remove the old patches that are not needed any more.

rebased to master and applied.

Tnx, Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de