Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/07 22:27:47+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/07 19:20:07+02:00 uni-frankfurt.de!mickeyl
upgrade python-pycurl to 7.12

2004/06/07 19:08:23+02:00 uni-frankfurt.de!mickeyl
upgrade curl to 7.12.0

BKrev: 40c5ad73822cIwP7iclsJ5uDkEe7uA

diff --git a/curl/curl-7.12.0/m4.patch b/curl/curl-7.12.0/m4.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/curl/curl_7.10.8.oe b/curl/curl_7.10.8.oe
deleted file mode 100644 (file)
index bac29ec..0000000
--- a/curl/curl_7.10.8.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DEPENDS = "zlib"
-DESCRIPTION = "Command line tool and library for \
-client-side URL transfers."
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
-
-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
-}

diff --git a/curl/curl_7.11.0.oe b/curl/curl_7.11.0.oe
deleted file mode 100644 (file)
index f1a536e..0000000
--- a/curl/curl_7.11.0.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DEPENDS = "zlib"
-DESCRIPTION = "Command line tool and library for \
-client-side URL transfers."
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
-
-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
-}

diff --git a/curl/curl_7.12.0.oe b/curl/curl_7.12.0.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/python/python-curl_7.11.0.oe b/python/python-curl_7.11.0.oe
deleted file mode 100644 (file)
index ec9a1f9..0000000
--- a/python/python-curl_7.11.0.oe
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "libcurl Python Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
-RDEPENDS = "python-core curl (${PV})"
-DEPENDS = "curl-${PV}"
-SRCNAME = "pycurl"
-
-SRC_URI = "http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils

diff --git a/python/python-pycurl_7.12.oe b/python/python-pycurl_7.12.oe
new file mode 100644 (file)
index 0000000..e69de29