mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

zlib: Clean up recipe and use BBCLASSEXTEND for native and sdk versions

Browse Source
This commit is contained in:
Richard Purdie
2009-01-03 17:31:17 +00:00
parent 64c7fa4734
commit c4a39f6417
6 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/native.bbclass
View File

@@ -105,6 +105,12 @@ python __anonymous () {
else:
autoextend = False
for dep in deps:
if dep.endswith("-cross"):
if autoextend:
depends = depends.replace(dep, dep.replace("-cross", "-native"))
else:
bb.note("%s has depends %s which ends in -cross?" % (pn, dep))
if not dep.endswith("-native"):
if autoextend:
depends = depends.replace(dep, dep + "-native")

11
meta/packages/zlib/zlib-native.inc
View File

@@ -1,11 +0,0 @@
ZLIB_EXTRA = ""
inherit native
do_stage() {
install -m 0644 zlib.h ${STAGING_INCDIR}/
install -m 0644 zconf.h ${STAGING_INCDIR}/
install -m 0644 zlibdefs.h ${STAGING_INCDIR}/
oe_libinstall -a -so libz ${STAGING_LIBDIR}
}
DEPENDS = "libtool-native"

2
meta/packages/zlib/zlib-native_1.2.3.bb
View File

@@ -1,2 +0,0 @@
require zlib_${PV}.bb
require zlib-native.inc

10
meta/packages/zlib/zlib-sdk.inc
View File

@@ -1,10 +0,0 @@
ZLIB_EXTRA = ""
inherit sdk
do_stage() {
install -d ${STAGING_INCDIR}
install -m 0644 zlib.h ${STAGING_INCDIR}/
install -m 0644 zconf.h ${STAGING_INCDIR}/
install -m 0644 zlibdefs.h ${STAGING_INCDIR}/
oe_libinstall -a -so libz ${STAGING_LIBDIR}
}

2
meta/packages/zlib/zlib-sdk_1.2.3.bb
View File

@@ -1,2 +0,0 @@
require zlib_${PV}.bb
require zlib-sdk.inc

22
meta/packages/zlib/zlib_1.2.3.bb
View File

@@ -3,31 +3,15 @@ SECTION = "libs"
PRIORITY = "required"
HOMEPAGE = "http://www.gzip.org/zlib/"
LICENSE = "zlib"
PR = "r6"
PR = "r7"
SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
file://1.2.3.3.dfsg.patch.gz;patch=1 \
file://visibility.patch;patch=1 \
file://autotools.patch;patch=1 "
S = "${WORKDIR}/zlib-${PV}"
DEPENDS = "libtool-cross"
inherit autotools
inherit autotools_stage
do_stage() {
install -m 0644 zlib.h ${STAGING_INCDIR}/
install -m 0644 zconf.h ${STAGING_INCDIR}/
install -m 0644 zlibdefs.h ${STAGING_INCDIR}/
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
}
BBCLASSEXTEND = "native sdk"