From: Chris Larson <clarson@kergoth.com>
Date: Sun, 2 Nov 2003 04:05:19 +0000 (+0000)
Subject: Correct the output packaging for db3 to actually include the libs in the main package... 
X-Git-Tag: Release-2010-05/1~20586
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2099e072dddd23eacef3a67c7aaf0d4c0426960;p=openembedded.git

Correct the output packaging for db3 to actually include the libs in the main package, and fix up staging to make the apache 2.0.48 build happy.

BKrev: 3fa4827foCLiQ-j0DHAooD7u_04wCA
---

diff --git a/db/db3_3.2.9.oe b/db/db3_3.2.9.oe
index 4cebaa29d5..c4d86ed5ab 100644
--- a/db/db3_3.2.9.oe
+++ b/db/db3_3.2.9.oe
@@ -7,11 +7,14 @@ B = ${WORKDIR}/db-${PV}/build_unix
 
 inherit autotools libtool
 
-EXTRA_OECONF = '--enable-shared --enable-compat185'
+EXTRA_OECONF = '--enable-shared --enable-compat185 --enable-static'
 EXTRA_OEMAKE = "'SHELL=/bin/sh' 'ar=`which ${AR}`' 'chmod=`which chmod`' \
 		'cp=`which cp`' 'ln=`which ln`' 'mkdir=`which mkdir`' 'ranlib=`which ${RANLIB}`' \
 		'rm=`which rm`' 'strip=`which ${STRIP}`'"
 
+FILES_${PN}=${bindir} ${libdir}/libdb-3.2.{so,a,la}
+FILES_${PN}-dev=${includedir} ${libdir}/libdb.so ${libdir}/libdb-3.so
+
 do_configure_prepend () {
 	(
 		cd ${S}
@@ -33,6 +36,7 @@ do_stage () {
 	install -m 0644 db_185.h ../include/db_cxx.h db.h ${STAGING_DIR}/target/include/
 	install -m 0755 .libs/libdb-3.2.so ${STAGING_LIBDIR}/
 	ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb-3.so
+	ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb3.so
 	ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb.so
 	install -m 0644 .libs/libdb-3.2.la ${STAGING_LIBDIR}/
 }