Merge openembedded@openembedded.bkbits.net:packages

into odin.(none):/home/kergoth/code/packages

2004/07/15 18:21:14-05:00 (none)!kergoth
Make curl make use of pkgconfig, installing curl.pc.

BKrev: 40f7117bbkU5Op1xo9JVa5lpqUREow

2 files changed, 29 insertions, 0 deletions

diff --git a/curl/curl-7.12.0/pkgconfig.patch b/curl/curl-7.12.0/pkgconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/curl/curl-7.12.0/pkgconfig.patch
diff --git a/curl/curl_7.12.0.oe b/curl/curl_7.12.0.oe
index e69de29bb2..5d0b6702f0 100644
--- a/curl/curl_7.12.0.oe
+++ b/curl/curl_7.12.0.oe
@@ -0,0 +1,29 @@
+# NOTE: FIXME: curl puts its LDFLAGS in its curl-config and curl.pc files.
+# This is flawed, as the LDFLAGS are often overridden by the user, and in
+# addition, are generally specific to the *build* environment, not target.
+# curl's build should be fixed to manipulate LIBS where appropriate and
+# use that. -CL
+
+DEPENDS = "zlib"
+DESCRIPTION = "Command line tool and library for \
+client-side URL transfers."
+PR = "r1"
+
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+           file://m4.patch;patch=1 \
+           file://pkgconfig.patch;patch=1"
+
+inherit autotools 
+
+EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
+		--without-ssl --with-random=/dev/urandom"
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/curl
+	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+	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
+        chmod a+rx ${STAGING_BINDIR}/curl-config
+}