zlib-1.1.4.oe:

  Fully populate zlib's install area.
libogg-1.0.0.oe:
  Remove patcher from depends

BKrev: 3f70d078g927KKB1I5D9XW7ucojVkA

diff --git a/content/libogg-1.0.0.oe b/content/libogg-1.0.0.oe
index 9939482..45a6e30 100644 (file)
--- a/content/libogg-1.0.0.oe
+++ b/content/libogg-1.0.0.oe
@@ -3,7 +3,7 @@ PRIORITY="optional"
 MAINTAINER=""
 RDEPENDS="libc6"
 SECTION="libs"
-DEPENDS=virtual/libc patcher
+DEPENDS=virtual/libc
 
 SRC_URI = "ftp://ftp.debian.org/debian/pool/main/libo/libogg/${PN}_${PV}.orig.tar.gz"
 SRC_URI_append = " file://${FILESDIR}/libogg-configure.patch;patch=1"

diff --git a/content/zlib-1.1.4.oe b/content/zlib-1.1.4.oe
index 1788743..3153aac 100644 (file)
--- a/content/zlib-1.1.4.oe
+++ b/content/zlib-1.1.4.oe
@@ -12,10 +12,11 @@ export LDSHARED:="${CC} -shared -Wl,-soname,libz.so.1"
 export LDFLAGS:="${LDFLAGS} -L. -lz"
 export CFLAGS:="-fPIC ${CFLAGS}"
 export AR:="${AR} rc"
+EXTRA_OEMAKE=
 
 do_compile() {
        ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
-       oe_runmake libz.so.1.1.4 libz.a
+       oe_runmake -e MAKEFLAGS="" libz.so.1.1.4 libz.a
 }
 
 do_stage() {
@@ -29,12 +30,7 @@ do_stage() {
 }
 
 do_install() {
-       install -d ${D}/usr/lib
-       install -m 0755 libz.so.1.1.4 ${D}/usr/lib/libz.so.1.1.4
-       ln -sf ./libz.so.1.1.4 ${D}/usr/lib/libz.so.1
-       ln -sf ./libz.so.1.1.4 ${D}/usr/lib/libz.so
+       install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir}
+       oe_runmake 'prefix=${D}/${prefix}' 'includedir=${D}/${includedir}' \
+                  'libdir=${D}/${libdir}' install
 }
-
-PACKAGES="zlib1g"
-FILES=""
-FILES_zlib1g="/usr/lib/libz.so.1.1.4 /usr/lib/libz.so.1 /usr/lib/libz.so"