From 2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 9 May 2004 03:00:50 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 23:00:41-04:00 local!kergoth Upgrade the alsa packages to 1.0.4. 2004/05/08 22:17:13-04:00 local!kergoth Fix compile error with adns, resulting from a function definition not matching the declaration. 2004/05/08 18:00:51-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:20-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:15-04:00 local!kergoth Fixing up the libtool-native/libtool-cross mess. 2004/05/08 13:59:04-04:00 local!kergoth Bugfix in ncurses usage of oe_libinstall. 2004/05/07 21:46:16-04:00 local!kergoth Merge 2004/05/07 21:45:26-04:00 local!kergoth Adapt some .oe's to use oe_libinstall. BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ --- curl/curl_7.10.8.oe | 4 +--- curl/curl_7.11.0.oe | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'curl') diff --git a/curl/curl_7.10.8.oe b/curl/curl_7.10.8.oe index d06208eaf2..6e02b39d58 100644 --- a/curl/curl_7.10.8.oe +++ b/curl/curl_7.10.8.oe @@ -12,9 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ do_stage () { install -d ${STAGING_INCDIR}/curl install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_soinstall lib/.libs/libcurl.so.2.0.2 ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.a ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.lai ${STAGING_LIBDIR}/libcurl.la + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \ | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config diff --git a/curl/curl_7.11.0.oe b/curl/curl_7.11.0.oe index 0bbd7a57b9..9b162a96bf 100644 --- a/curl/curl_7.11.0.oe +++ b/curl/curl_7.11.0.oe @@ -12,9 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ do_stage () { install -d ${STAGING_INCDIR}/curl install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_soinstall lib/.libs/libcurl.so.2.0.2 ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.a ${STAGING_LIBDIR}/ - install -m 0644 lib/.libs/libcurl.lai ${STAGING_LIBDIR}/libcurl.la + oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \ | sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config -- cgit v1.2.3