Skip to contentSkip to conversation

zlib: Add version 1.2.5

PATCH Superseded Eric Benard 4 participants 7 messages May 2, 2010 – May 3, 2010

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zlib: Add version 1.2.5

- update autotool patch for this version
- tested on x86

---
 recipes/zlib/files/0001-autotools.patch |   58 +++++++++++++++++++++++++++++++
 recipes/zlib/zlib-native_1.2.5.bb       |    9 +++++
 recipes/zlib/zlib-sdk_1.2.5.bb          |    4 ++
 recipes/zlib/zlib_1.2.5.bb              |   22 ++++++++++++
 4 files changed, 93 insertions(+), 0 deletions(-)
 create mode 100644 recipes/zlib/files/0001-autotools.patch
 create mode 100644 recipes/zlib/zlib-native_1.2.5.bb
 create mode 100644 recipes/zlib/zlib-sdk_1.2.5.bb
 create mode 100644 recipes/zlib/zlib_1.2.5.bb
recipes/zlib/files/0001-autotools.patch new file +58 -0
new file mode 100644
index 0000000..38cae87
@@ -0,0 +1,58 @@
+From ce7f7b24c6bf140feeb92da4e9b662e35a163c35 Mon Sep 17 00:00:00 2001
+From: Eric Benard <[email protected]>
+Date: Sun, 2 May 2010 10:49:05 +0200
+Subject: [PATCH] autotools
+
+---
+ Makefile.am  |   12 ++++++++++++
+ configure.ac |   17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..0f2e882
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,12 @@
++lib_LTLIBRARIES = libz.la
++
++libz_la_SOURCES = adler32.c compress.c crc32.c gzclose.c gzlib.c gzread.c gzwrite.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                                                                                       
++
++pkgconfigdir = $(libdir)/pkgconfig                                                                                     
++pkgconfig_DATA = zlib.pc
+\ No newline at end of file
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..177c89a
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,17 @@
++AC_INIT(zlib,1.2.5)
++AC_CONFIG_SRCDIR(adler32.c)
++AM_INIT_AUTOMAKE(zlibs,1.2.5)
++
++AC_PREREQ([2.59])
++
++AC_PROG_CC([gcc])
++AC_PROG_LIBTOOL
++
++AC_HEADER_STDC
++
++AC_CONFIG_FILES([
++Makefile
++zlib.pc
++])
++
++AC_OUTPUT
+\ No newline at end of file
+-- 
+1.6.3.3
+
recipes/zlib/zlib-native_1.2.5.bb new file +9 -0
new file mode 100644
index 0000000..1ac5c96
@@ -0,0 +1,9 @@
+require zlib_${PV}.bb
+ZLIB_EXTRA = ""
+DEPENDS = "libtool-native"
+
+inherit native
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
+
recipes/zlib/zlib-sdk_1.2.5.bb new file +4 -0
new file mode 100644
index 0000000..4863395
@@ -0,0 +1,4 @@
+require zlib_${PV}.bb
+LIB_EXTRA = ""
+
+inherit sdk
recipes/zlib/zlib_1.2.5.bb new file +22 -0
new file mode 100644
index 0000000..3a8c26f
@@ -0,0 +1,22 @@
+DESCRIPTION = "Zlib Compression Library"
+SECTION = "libs"
+PRIORITY = "required"
+HOMEPAGE = "http://www.gzip.org/zlib/"
+LICENSE = "zlib"
+PR ="r1"
+
+SRC_URI = "http://www.zlib.net/zlib-1.2.5.tar.bz2 \
+		file://0001-autotools.patch;patch=1 "
+
+S = "${WORKDIR}/zlib-${PV}"
+
+DEPENDS = "libtool-cross"
+
+inherit autotools
+
+do_stage() {
+	autotools_stage_all
+}
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
Signature · 1 line
1.6.3.3
#1 lore raw

Hi,

Quoted 3 lines · Eric Benard

++
++libz_la_LDFLAGS = -version-number 1:2:3
++

forget this one I didn't update the patch before format patch.

Eric

#2 lore raw

PATCH v2 1/1 zlib: Add version 1.2.5

In reply to Eric Benard

- update autotool patch for this version
- tested on x86

---
v2 :
fix the autotools patch to have the correct version number remove whitspaces

 recipes/zlib/files/0001-autotools.patch |   57 +++++++++++++++++++++++++++++++
 recipes/zlib/zlib-native_1.2.5.bb       |    9 +++++
 recipes/zlib/zlib-sdk_1.2.5.bb          |    4 ++
 recipes/zlib/zlib_1.2.5.bb              |   22 ++++++++++++
 4 files changed, 92 insertions(+), 0 deletions(-)
 create mode 100644 recipes/zlib/files/0001-autotools.patch
 create mode 100644 recipes/zlib/zlib-native_1.2.5.bb
 create mode 100644 recipes/zlib/zlib-sdk_1.2.5.bb
 create mode 100644 recipes/zlib/zlib_1.2.5.bb
recipes/zlib/files/0001-autotools.patch new file +57 -0
new file mode 100644
index 0000000..6642860
@@ -0,0 +1,57 @@
+From d6b0c74edb3fc58060d1ab337bcb1f838328ebbf Mon Sep 17 00:00:00 2001
+From: Eric Benard <[email protected]>
+Date: Sun, 2 May 2010 10:49:05 +0200
+Subject: [PATCH] autotools
+
+---
+ Makefile.am  |   12 ++++++++++++
+ configure.ac |   17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..76976fb
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,12 @@
++lib_LTLIBRARIES = libz.la
++
++libz_la_SOURCES = adler32.c compress.c crc32.c gzclose.c gzlib.c gzread.c gzwrite.c \
++		uncompr.c deflate.c trees.c zutil.c inflate.c infback.c inftrees.c \
++		inffast.c
++
++libz_la_LDFLAGS = -version-number 1:2:5
++
++include_HEADERS = zconf.h zlib.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = zlib.pc
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..177c89a
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,17 @@
++AC_INIT(zlib,1.2.5)
++AC_CONFIG_SRCDIR(adler32.c)
++AM_INIT_AUTOMAKE(zlibs,1.2.5)
++
++AC_PREREQ([2.59])
++
++AC_PROG_CC([gcc])
++AC_PROG_LIBTOOL
++
++AC_HEADER_STDC
++
++AC_CONFIG_FILES([
++Makefile
++zlib.pc
++])
++
++AC_OUTPUT
+\ No newline at end of file
+-- 
+1.6.3.3
+
recipes/zlib/zlib-native_1.2.5.bb new file +9 -0
new file mode 100644
index 0000000..1ac5c96
@@ -0,0 +1,9 @@
+require zlib_${PV}.bb
+ZLIB_EXTRA = ""
+DEPENDS = "libtool-native"
+
+inherit native
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
+
recipes/zlib/zlib-sdk_1.2.5.bb new file +4 -0
new file mode 100644
index 0000000..4863395
@@ -0,0 +1,4 @@
+require zlib_${PV}.bb
+LIB_EXTRA = ""
+
+inherit sdk
recipes/zlib/zlib_1.2.5.bb new file +22 -0
new file mode 100644
index 0000000..3a8c26f
@@ -0,0 +1,22 @@
+DESCRIPTION = "Zlib Compression Library"
+SECTION = "libs"
+PRIORITY = "required"
+HOMEPAGE = "http://www.gzip.org/zlib/"
+LICENSE = "zlib"
+PR ="r1"
+
+SRC_URI = "http://www.zlib.net/zlib-1.2.5.tar.bz2 \
+		file://0001-autotools.patch;patch=1 "
+
+S = "${WORKDIR}/zlib-${PV}"
+
+DEPENDS = "libtool-cross"
+
+inherit autotools
+
+do_stage() {
+	autotools_stage_all
+}
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
Signature · 1 line
1.6.3.3
#3 lore raw

В сообщении от Воскресенье 02 мая 2010 14:21:38 автор Eric Benard написал:

Quoted 8 lines

- update autotool patch for this version
- tested on x86

---
v2 :
fix the autotools patch to have the correct version number remove whitspaces

Please, the next time you submit updated version of any patch go to patchwork.openembedded.org and update the status of old one to "Superseded". I've done that for this particular patch as I've looked at it anyway, but at quick glance there are other leftovers there, so it'd be nice if you've cleaned that up.

Quoted 10 lines
 recipes/zlib/files/0001-autotools.patch |   57
 +++++++++++++++++++++++++++++++ recipes/zlib/zlib-native_1.2.5.bb       | 
   9 +++++
 recipes/zlib/zlib-sdk_1.2.5.bb          |    4 ++
 recipes/zlib/zlib_1.2.5.bb              |   22 ++++++++++++
 4 files changed, 92 insertions(+), 0 deletions(-)
 create mode 100644 recipes/zlib/files/0001-autotools.patch
 create mode 100644 recipes/zlib/zlib-native_1.2.5.bb
 create mode 100644 recipes/zlib/zlib-sdk_1.2.5.bb
 create mode 100644 recipes/zlib/zlib_1.2.5.bb

I think it'd be nice to do BBCLASSEXTEND conversion here (there was an attempt:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-March/018132.html
) and add new version with a move to common .inc file.

recipes/zlib/zlib_1.2.5.bb line 6

Quoted 9 lines
recipes/zlib/zlib_1.2.5.bb new file +6 -0
@@ -0,0 +1,22 @@
+DESCRIPTION = "Zlib Compression Library"
+SECTION = "libs"
+PRIORITY = "required"
+HOMEPAGE = "http://www.gzip.org/zlib/"
+LICENSE = "zlib"
+PR ="r1"

PR should be "r0".

recipes/zlib/zlib_1.2.5.bb line 19

Quoted 5 lines
recipes/zlib/zlib_1.2.5.bb new file +5 -0
+inherit autotools
+
+do_stage() {
+       autotools_stage_all
+}

Maybe change this to

inherit autotools_stage

?

Signature · 3 lines
 http://roman.khimov.ru
mailto: [email protected]
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
#4 lore raw
Quoted 6 lines · Roman I Khimov

Please, the next time you submit updated version of any patch go to patchwork.openembedded.org and update the status of old one to "Superseded". I've done that for this particular patch as I've looked at it anyway, but at quick glance there are other leftovers there, so it'd be nice if you've cleaned that up.

done, I was not aware of these features in patchwork.

Quoted 5 lines

I think it'd be nice to do BBCLASSEXTEND conversion here (there was an attempt:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-March/018132.html
) and add new version with a move to common .inc file.

OK, I will send an updated patch with this.

Eric

#5 lore raw
In reply to Eric Benard

recipes/zlib/zlib_1.2.5.bb line 20

Quoted 9 lines · Eric Benard

- update autotool patch for this version
- tested on x86

---

recipes/zlib/zlib_1.2.5.bb new file +4 -0
+do_stage() {
+	autotools_stage_all
+}
+

do_stage is deprecated and shouldn't be used for new recipes. Furthermore zlib is a Candidate for BBCLASSEXTEND to get native and sdk packages with one recipe.

Bye Henning