From afc22e54aea54fe030722502f865565d8b7133c4 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 5 Nov 2009 12:50:43 +0000
Subject: curl: Convert to BBCLASSEXTEND

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/curl/curl-native_7.18.0.bb     |  4 ----
 meta/packages/curl/curl-nativesdk_7.18.0.bb  |  4 ----
 meta/packages/curl/curl/pkgconfig_fix.patch  | 35 ++++++++++++++++++++++++++++
 meta/packages/curl/curl_7.18.0.bb            |  3 +++
 meta/packages/curl/files/pkgconfig_fix.patch | 35 ----------------------------
 5 files changed, 38 insertions(+), 43 deletions(-)
 delete mode 100644 meta/packages/curl/curl-native_7.18.0.bb
 delete mode 100644 meta/packages/curl/curl-nativesdk_7.18.0.bb
 create mode 100644 meta/packages/curl/curl/pkgconfig_fix.patch
 delete mode 100644 meta/packages/curl/files/pkgconfig_fix.patch

(limited to 'meta')

diff --git a/meta/packages/curl/curl-native_7.18.0.bb b/meta/packages/curl/curl-native_7.18.0.bb
deleted file mode 100644
index 880caac7c..000000000
--- a/meta/packages/curl/curl-native_7.18.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require curl_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-
diff --git a/meta/packages/curl/curl-nativesdk_7.18.0.bb b/meta/packages/curl/curl-nativesdk_7.18.0.bb
deleted file mode 100644
index eeb653f63..000000000
--- a/meta/packages/curl/curl-nativesdk_7.18.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require curl_${PV}.bb
-inherit nativesdk
-DEPENDS = "zlib-nativesdk"
-
diff --git a/meta/packages/curl/curl/pkgconfig_fix.patch b/meta/packages/curl/curl/pkgconfig_fix.patch
new file mode 100644
index 000000000..e02316a73
--- /dev/null
+++ b/meta/packages/curl/curl/pkgconfig_fix.patch
@@ -0,0 +1,35 @@
+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,7 @@
+ 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@
++Requires.private: @GNUTLS_REQUIRED@
++Libs: -L${libdir} -lcurl
++Libs.private: -ldl -lz
+ Cflags: -I${includedir}
+Index: curl-7.16.4/configure.ac
+===================================================================
+--- curl-7.16.4.orig/configure.ac	2008-03-18 11:40:30.000000000 +0000
++++ curl-7.16.4/configure.ac	2008-03-18 11:42:06.000000000 +0000
+@@ -1361,6 +1361,7 @@
+        AC_SUBST(USE_GNUTLS, [1])
+        GNUTLS_ENABLED=1
+        USE_GNUTLS="yes"
++       GNUTLS_REQUIRED="gnutls"
+        curl_ssl_msg="enabled (GnuTLS)"
+        ],
+        [
+@@ -1387,6 +1388,8 @@
+ 
+ fi dnl OPENSSL != 1
+ 
++AC_SUBST(GNUTLS_REQUIRED)
++
+ dnl ----------------------------------------------------
+ dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
+ dnl ----------------------------------------------------
diff --git a/meta/packages/curl/curl_7.18.0.bb b/meta/packages/curl/curl_7.18.0.bb
index 71c157e52..19b46faf2 100644
--- a/meta/packages/curl/curl_7.18.0.bb
+++ b/meta/packages/curl/curl_7.18.0.bb
@@ -1,6 +1,8 @@
 DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
 DEPENDS = "zlib gnutls"
+DEPENDS_virtclass-native = "zlib-native"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
 SECTION = "console/network"
 PR = "r1"
 
@@ -44,3 +46,4 @@ FILES_lib${PN}-dev = "${includedir} \
 FILES_lib${PN}-doc = "${mandir}/man3 \
                       ${mandir}/man1/curl-config.1"
 
+BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file
diff --git a/meta/packages/curl/files/pkgconfig_fix.patch b/meta/packages/curl/files/pkgconfig_fix.patch
deleted file mode 100644
index e02316a73..000000000
--- a/meta/packages/curl/files/pkgconfig_fix.patch
+++ /dev/null
@@ -1,35 +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,7 @@
- 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@
-+Requires.private: @GNUTLS_REQUIRED@
-+Libs: -L${libdir} -lcurl
-+Libs.private: -ldl -lz
- Cflags: -I${includedir}
-Index: curl-7.16.4/configure.ac
-===================================================================
---- curl-7.16.4.orig/configure.ac	2008-03-18 11:40:30.000000000 +0000
-+++ curl-7.16.4/configure.ac	2008-03-18 11:42:06.000000000 +0000
-@@ -1361,6 +1361,7 @@
-        AC_SUBST(USE_GNUTLS, [1])
-        GNUTLS_ENABLED=1
-        USE_GNUTLS="yes"
-+       GNUTLS_REQUIRED="gnutls"
-        curl_ssl_msg="enabled (GnuTLS)"
-        ],
-        [
-@@ -1387,6 +1388,8 @@
- 
- fi dnl OPENSSL != 1
- 
-+AC_SUBST(GNUTLS_REQUIRED)
-+
- dnl ----------------------------------------------------
- dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
- dnl ----------------------------------------------------
-- 
cgit v1.2.3