summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/curl/curl-native_7.16.4.bb (renamed from meta/packages/curl/curl-native_7.16.2.bb)0
-rw-r--r--meta/packages/curl/curl-sdk_7.16.4.bb (renamed from meta/packages/curl/curl-sdk_7.16.2.bb)0
-rw-r--r--meta/packages/curl/curl_7.16.4.bb (renamed from meta/packages/curl/curl_7.16.2.bb)35
-rw-r--r--meta/packages/curl/files/pkgconfig_fix.patch35
4 files changed, 58 insertions, 12 deletions
diff --git a/meta/packages/curl/curl-native_7.16.2.bb b/meta/packages/curl/curl-native_7.16.4.bb
index e056ec10c3..e056ec10c3 100644
--- a/meta/packages/curl/curl-native_7.16.2.bb
+++ b/meta/packages/curl/curl-native_7.16.4.bb
diff --git a/meta/packages/curl/curl-sdk_7.16.2.bb b/meta/packages/curl/curl-sdk_7.16.4.bb
index 816fe645bc..816fe645bc 100644
--- a/meta/packages/curl/curl-sdk_7.16.2.bb
+++ b/meta/packages/curl/curl-sdk_7.16.4.bb
diff --git a/meta/packages/curl/curl_7.16.2.bb b/meta/packages/curl/curl_7.16.4.bb
index a8749f6662..ef85358f3e 100644
--- a/meta/packages/curl/curl_7.16.2.bb
+++ b/meta/packages/curl/curl_7.16.4.bb
@@ -1,21 +1,27 @@
1DESCRIPTION = "Command line tool and library for client-side URL transfers." 1DESCRIPTION = "Command line tool and library for client-side URL transfers."
2LICENSE = "MIT" 2LICENSE = "MIT"
3DEPENDS = "zlib" 3DEPENDS = "zlib gnutls"
4SECTION = "console/network" 4SECTION = "console/network"
5RPROVIDES_lib${PN} += "libcurl" 5PR = "r3"
6PR = "r2"
7 6
8SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2" 7SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
8 file://pkgconfig_fix.patch;patch=1"
9S = "${WORKDIR}/curl-${PV}" 9S = "${WORKDIR}/curl-${PV}"
10 10
11inherit autotools pkgconfig binconfig 11inherit autotools pkgconfig binconfig
12 12
13EXTRA_OECONF = "--with-zlib=${STAGING_DIR_HOST}${layout_prefix}/ \ 13EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
14 --without-ssl \ 14 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
15 --without-ssl \
16 --without-libssh2 \
15 --with-random=/dev/urandom \ 17 --with-random=/dev/urandom \
16 --without-libidn \ 18 --without-libidn \
17 --enable-http \ 19 --enable-crypto-auth \
18 --enable-file" 20 "
21
22do_configure_prepend() {
23 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
24}
19 25
20do_stage () { 26do_stage () {
21 install -d ${STAGING_INCDIR}/curl 27 install -d ${STAGING_INCDIR}/curl
@@ -23,13 +29,17 @@ do_stage () {
23 oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} 29 oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
24} 30}
25 31
26PACKAGES += "libcurl libcurl-dev libcurl-doc libcurl-dbg" 32PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
33
27FILES_${PN} = "${bindir}/curl" 34FILES_${PN} = "${bindir}/curl"
28FILES_${PN}-dbg = "${bindir}/.debug/" 35
29FILES_${PN}-dev = " " 36FILES_${PN}-certs = "${datadir}/curl/curl-*"
37PACKAGE_ARCH_${PN}-certs = "all"
38
30FILES_${PN}-doc = "${mandir}/man1/curl.1" 39FILES_${PN}-doc = "${mandir}/man1/curl.1"
40
31FILES_lib${PN} = "${libdir}/lib*.so.*" 41FILES_lib${PN} = "${libdir}/lib*.so.*"
32FILES_lib${PN}-dbg = "${libdir}/.debug/lib*.so.*" 42RRECOMMENDS_lib${PN} += "${PN}-certs"
33FILES_lib${PN}-dev = "${includedir} \ 43FILES_lib${PN}-dev = "${includedir} \
34 ${libdir}/lib*.so \ 44 ${libdir}/lib*.so \
35 ${libdir}/lib*.a \ 45 ${libdir}/lib*.a \
@@ -37,6 +47,7 @@ FILES_lib${PN}-dev = "${includedir} \
37 ${libdir}/pkgconfig \ 47 ${libdir}/pkgconfig \
38 ${datadir}/aclocal \ 48 ${datadir}/aclocal \
39 ${bindir}/*-config" 49 ${bindir}/*-config"
50
40FILES_lib${PN}-doc = "${mandir}/man3 \ 51FILES_lib${PN}-doc = "${mandir}/man3 \
41 ${mandir}/man1/curl-config.1" 52 ${mandir}/man1/curl-config.1"
42 53
diff --git a/meta/packages/curl/files/pkgconfig_fix.patch b/meta/packages/curl/files/pkgconfig_fix.patch
new file mode 100644
index 0000000000..e02316a73a
--- /dev/null
+++ b/meta/packages/curl/files/pkgconfig_fix.patch
@@ -0,0 +1,35 @@
1Index: curl-7.16.4/libcurl.pc.in
2===================================================================
3--- curl-7.16.4.orig/libcurl.pc.in 2007-02-18 09:41:27.000000000 +0000
4+++ curl-7.16.4/libcurl.pc.in 2008-03-18 11:42:43.000000000 +0000
5@@ -33,6 +33,7 @@
6 URL: http://curl.haxx.se/
7 Description: Library to transfer files with ftp, http, etc.
8 Version: @VERSION@
9-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
10-Libs.private: @LIBCURL_LIBS@ @LIBS@
11+Requires.private: @GNUTLS_REQUIRED@
12+Libs: -L${libdir} -lcurl
13+Libs.private: -ldl -lz
14 Cflags: -I${includedir}
15Index: curl-7.16.4/configure.ac
16===================================================================
17--- curl-7.16.4.orig/configure.ac 2008-03-18 11:40:30.000000000 +0000
18+++ curl-7.16.4/configure.ac 2008-03-18 11:42:06.000000000 +0000
19@@ -1361,6 +1361,7 @@
20 AC_SUBST(USE_GNUTLS, [1])
21 GNUTLS_ENABLED=1
22 USE_GNUTLS="yes"
23+ GNUTLS_REQUIRED="gnutls"
24 curl_ssl_msg="enabled (GnuTLS)"
25 ],
26 [
27@@ -1387,6 +1388,8 @@
28
29 fi dnl OPENSSL != 1
30
31+AC_SUBST(GNUTLS_REQUIRED)
32+
33 dnl ----------------------------------------------------
34 dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
35 dnl ----------------------------------------------------