diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-12-14 19:12:31 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-12-14 19:12:31 +0000 |
| commit | 49415c16642f24643a2b9d38e1e87beab4d54790 (patch) | |
| tree | f4426df82ea8ecff955e7721edfd351102cd5c64 | |
| parent | e186bd6eba947e6e66c10ae0e31a05922b408d97 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/12/14 13:32:07-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded
2004/12/14 13:12:29-06:00 ti.com!kergoth
Apply patch to zlib to use gcc visibility for its symbols if it's available.
BKrev: 41bf3b1fCXgkr-L3bPM_ndJ6DCIvJw
| -rw-r--r-- | packages/zlib/files/visibility.patch | 0 | ||||
| -rw-r--r-- | packages/zlib/zlib_1.1.4.bb | 34 | ||||
| -rw-r--r-- | packages/zlib/zlib_1.2.2.bb | 37 |
3 files changed, 71 insertions, 0 deletions
diff --git a/packages/zlib/files/visibility.patch b/packages/zlib/files/visibility.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zlib/files/visibility.patch diff --git a/packages/zlib/zlib_1.1.4.bb b/packages/zlib/zlib_1.1.4.bb index e69de29bb2..cf8990eb60 100644 --- a/packages/zlib/zlib_1.1.4.bb +++ b/packages/zlib/zlib_1.1.4.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Zlib Compression Library" +SECTION = "libs" +PRIORITY = "required" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +HOMEPAGE = "http://www.gzip.org/zlib/" +LICENSE = "zlib" +PR = "r1" + +SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz \ + file://visibility.patch;patch=1" +S = "${WORKDIR}/zlib-${PV}" + +export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1" +LDFLAGS_append = " -L. -lz" +CFLAGS_prepend = "-fPIC " +AR_append = " rc" +EXTRA_OEMAKE = "" + +do_compile() { + ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} + oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a +} + +do_stage() { + install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h + install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h + oe_libinstall -a -so libz ${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir} + oe_runmake "prefix=${D}/${prefix}" "includedir=${D}/${includedir}" \ + "libdir=${D}/${libdir}" install +} diff --git a/packages/zlib/zlib_1.2.2.bb b/packages/zlib/zlib_1.2.2.bb index e69de29bb2..ae2231bf76 100644 --- a/packages/zlib/zlib_1.2.2.bb +++ b/packages/zlib/zlib_1.2.2.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Zlib Compression Library" +SECTION = "libs" +PRIORITY = "required" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +HOMEPAGE = "http://www.gzip.org/zlib/" +LICENSE = "zlib" +PR = "r1" + +SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz \ + file://visibility.patch;patch=1" +S = "${WORKDIR}/zlib-${PV}" + +export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1" +LDFLAGS_append = " -L. -lz" +CFLAGS_prepend = "-fPIC " +AR_append = " rc" +EXTRA_OEMAKE = "" + +do_compile() { + ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} + oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a +} + +do_stage() { + install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h + install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h + oe_libinstall -a -so libz ${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir} + oe_runmake "prefix=${D}/${prefix}" \ + "exec_prefix=${D}/${exec_prefix}" \ + "man3dir=${D}/${mandir}/man3" \ + "includedir=${D}/${includedir}" \ + "libdir=${D}/${libdir}" install +} |