[oe-commits] Khem Raj : curl: Fix build for native BBLASSEXTEND

[git version control]

Module: openembedded.git
Branch: master
Commit: 6901dc958c4254bafd4105c6c751246d50ba5ecd
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6901dc958c4254bafd4105c6c751246d50ba5ecd

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Oct 15 22:58:41 2010 -0700

curl: Fix build for native BBLASSEXTEND

Delete unused recipes.

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/curl/curl-common.inc                     |    4 ++--
 recipes/curl/curl-native_7.19.6.bb               |    9 ---------
 recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch |   13 -------------
 recipes/curl/curl-sdk_7.19.7.bb                  |   10 ----------
 recipes/curl/curl_7.19.6.bb                      |    8 --------
 recipes/curl/curl_7.20.0.bb                      |   11 -----------
 recipes/curl/curl_7.21.1.bb                      |    8 --------
 7 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc
index 0209e8d..ddaebb8 100644
--- a/recipes/curl/curl-common.inc
+++ b/recipes/curl/curl-common.inc
@@ -6,9 +6,9 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2;name=tarball \
            file://pkgconfig_fix.patch"
 S = "${WORKDIR}/curl-${PV}"
 
-INC_PR = "r3"
+INC_PR = "r4"
 
-CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"
+CURL_FEATURES = ${@['zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp','zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp']["${BPN}" == "${PN}"]}
 # other allowed features: ipv6, ares, openssl
 
 inherit autotools pkgconfig binconfig
diff --git a/recipes/curl/curl-native_7.19.6.bb b/recipes/curl/curl-native_7.19.6.bb
deleted file mode 100644
index 3ae50b6..0000000
--- a/recipes/curl/curl-native_7.19.6.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require curl-common.inc
-inherit native
-DEPENDS = "zlib-native"
-PR = "${INC_PR}.2"
-
-CURL_FEATURES = "zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"
-
-SRC_URI[tarball.md5sum] = "8402c1f654c51ad7287aad57c3aa79be"
-SRC_URI[tarball.sha256sum] = "ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021"
diff --git a/recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch b/recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch
deleted file mode 100644
index 7966779..0000000
--- a/recipes/curl/curl-sdk-7.19.7/pkgconfig_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: curl-7.16.4/libcurl.pc.in
-===================================================================
---- curl-7.16.4.orig/libcurl.pc.in	2007-02-18 09:41:27.000000000 +0000
-+++ curl-7.16.4/libcurl.pc.in	2008-03-18 11:42:43.000000000 +0000
-@@ -33,6 +33,6 @@
- URL: http://curl.haxx.se/
- Description: Library to transfer files with ftp, http, etc.
- Version: @VERSION@
--Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
--Libs.private: @LIBCURL_LIBS@ @LIBS@
-+Libs: -L${libdir} -lcurl
-+Libs.private: -ldl -lz
- Cflags: -I${includedir}
diff --git a/recipes/curl/curl-sdk_7.19.7.bb b/recipes/curl/curl-sdk_7.19.7.bb
deleted file mode 100644
index 0b2a606..0000000
--- a/recipes/curl/curl-sdk_7.19.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require curl-common.inc
-inherit sdk
-DEPENDS = "zlib-sdk"
-
-SRC_URI[tarball.md5sum] = "79a8fbb2eed5464b97bdf94bee109380"
-SRC_URI[tarball.sha256sum] = "1a15f94ae3401e3bd6208ce64155c2577815019824bceae7fd3221a12bc54a70"
-
-EXTRA_OECONF = " --without-gnutls "
-
-PR = "${INC_PR}.0"
diff --git a/recipes/curl/curl_7.19.6.bb b/recipes/curl/curl_7.19.6.bb
deleted file mode 100644
index 2a113c0..0000000
--- a/recipes/curl/curl_7.19.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require curl-common.inc
-require curl-target.inc
-
-SRC_URI += "file://off_t_abi_fix.patch;striplevel=0"
-PR = "${INC_PR}.1"
-
-SRC_URI[tarball.md5sum] = "8402c1f654c51ad7287aad57c3aa79be"
-SRC_URI[tarball.sha256sum] = "ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021"
diff --git a/recipes/curl/curl_7.20.0.bb b/recipes/curl/curl_7.20.0.bb
deleted file mode 100644
index a7864db..0000000
--- a/recipes/curl/curl_7.20.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require curl-common.inc
-require curl-target.inc
-
-PR = "${INC_PR}"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2;name=tarball \
-           file://off_t_abi_fix.patch;striplevel=0"
-
-SRC_URI[tarball.md5sum] = "3dda78c4a808d9a779dc3a2ae81b47d8"
-SRC_URI[tarball.sha256sum] = "eb516915da615d8f6b2b855004d5d4b19c468f080e3736d7a73c5599b9acab11"
-
diff --git a/recipes/curl/curl_7.21.1.bb b/recipes/curl/curl_7.21.1.bb
index e6192a9..5df4d6b 100644
--- a/recipes/curl/curl_7.21.1.bb
+++ b/recipes/curl/curl_7.21.1.bb
@@ -3,14 +3,6 @@ require curl-target.inc
 
 PR = "${INC_PR}.1"
 
-DEPENDS_virtclass-native = "zlib-native"
-CURL_FEATURES_virtclass-native = "zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"
-
-DEPENDS_virtclass-nativesdk = "zlib-sdk"
-DEPENDS_virtclass-sdk = "zlib-sdk"
-EXTRA_OECONF_virtclass-sdk = " --without-gnutls "
-EXTRA_OECONF_virtclass-nativesdk = " --without-gnutls "
-
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://off_t_abi_fix.patch;striplevel=0"