mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 09:49:32 +02:00
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
74
meta/recipes-support/curl/curl/noldlibpath.patch
Normal file
74
meta/recipes-support/curl/curl/noldlibpath.patch
Normal file
@@ -0,0 +1,74 @@
|
||||
Manipulating LD_LIBRARY_PATH can totally break builds when cross compiling.
|
||||
Since we never run compiled binaries for the target, we should *never* need
|
||||
to change LD_LIBRARY_PATH.
|
||||
|
||||
RP 9/6/2010
|
||||
|
||||
Index: curl-7.20.0/configure.ac
|
||||
===================================================================
|
||||
--- curl-7.20.0.orig/configure.ac 2010-06-09 11:06:30.000000000 +0100
|
||||
+++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.000000000 +0100
|
||||
@@ -1461,9 +1461,10 @@
|
||||
dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH
|
||||
dnl to prevent further configure tests to fail due to this
|
||||
|
||||
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
|
||||
- export LD_LIBRARY_PATH
|
||||
- AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
|
||||
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"
|
||||
+ #export LD_LIBRARY_PATH
|
||||
+ #AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])
|
||||
+ :
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1684,9 +1686,10 @@
|
||||
dnl LD_LIBRARY_PATH to prevent further configure tests to fail
|
||||
dnl due to this
|
||||
|
||||
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
|
||||
- export LD_LIBRARY_PATH
|
||||
- AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
|
||||
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"
|
||||
+ #export LD_LIBRARY_PATH
|
||||
+ #AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])
|
||||
+ :
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1696,6 +1699,8 @@
|
||||
|
||||
fi dnl OPENSSL != 1
|
||||
|
||||
+AC_SUBST(GNUTLS_REQUIRED)
|
||||
+
|
||||
dnl ----------------------------------------------------
|
||||
dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
|
||||
dnl ----------------------------------------------------
|
||||
@@ -1781,9 +1786,10 @@
|
||||
dnl LD_LIBRARY_PATH to prevent further configure tests to fail
|
||||
dnl due to this
|
||||
|
||||
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
|
||||
- export LD_LIBRARY_PATH
|
||||
- AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
|
||||
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"
|
||||
+ #export LD_LIBRARY_PATH
|
||||
+ #AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])
|
||||
+ :
|
||||
fi
|
||||
|
||||
fi
|
||||
@@ -1881,9 +1887,9 @@
|
||||
dnl libssh2_version is a post 1.0 addition
|
||||
AC_CHECK_FUNCS( libssh2_version )
|
||||
|
||||
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
|
||||
- export LD_LIBRARY_PATH
|
||||
- AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
|
||||
+ #LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"
|
||||
+ #export LD_LIBRARY_PATH
|
||||
+ #AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])
|
||||
fi
|
||||
else
|
||||
dnl no libssh2, revert back to clean variables
|
||||
35
meta/recipes-support/curl/curl/pkgconfig_fix.patch
Normal file
35
meta/recipes-support/curl/curl/pkgconfig_fix.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
Index: curl-7.20.0/libcurl.pc.in
|
||||
===================================================================
|
||||
--- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000
|
||||
+++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000
|
||||
@@ -35,6 +35,7 @@
|
||||
URL: http://curl.haxx.se/
|
||||
Description: Library to transfer files with ftp, http, etc.
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -lcurl @LIBS@
|
||||
-Libs.private: @LIBCURL_LIBS@ @LIBS@
|
||||
+Requires.private: @GNUTLS_REQUIRED@
|
||||
+Libs: -L${libdir} -lcurl
|
||||
+Libs.private: -ldl -lz
|
||||
Cflags: -I${includedir}
|
||||
Index: curl-7.20.0/configure.ac
|
||||
===================================================================
|
||||
--- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000
|
||||
+++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000
|
||||
@@ -1668,6 +1668,7 @@
|
||||
AC_SUBST(USE_GNUTLS, [1])
|
||||
GNUTLS_ENABLED=1
|
||||
USE_GNUTLS="yes"
|
||||
+ GNUTLS_REQUIRED="gnutls"
|
||||
curl_ssl_msg="enabled (GnuTLS)"
|
||||
],
|
||||
[
|
||||
@@ -1696,6 +1697,8 @@
|
||||
|
||||
fi dnl OPENSSL != 1
|
||||
|
||||
+AC_SUBST(GNUTLS_REQUIRED)
|
||||
+
|
||||
dnl ----------------------------------------------------
|
||||
dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
|
||||
dnl ----------------------------------------------------
|
||||
54
meta/recipes-support/curl/curl_7.21.0.bb
Normal file
54
meta/recipes-support/curl/curl_7.21.0.bb
Normal file
@@ -0,0 +1,54 @@
|
||||
DESCRIPTION = "Command line tool and library for client-side URL transfers."
|
||||
HOMEPAGE = "http://curl.haxx.se/"
|
||||
BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker"
|
||||
SECTION = "console/network"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
|
||||
|
||||
DEPENDS = "zlib gnutls"
|
||||
DEPENDS_virtclass-native = "zlib-native"
|
||||
DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
|
||||
file://noldlibpath.patch \
|
||||
file://pkgconfig_fix.patch"
|
||||
|
||||
inherit autotools pkgconfig binconfig
|
||||
|
||||
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
|
||||
--with-gnutls=${STAGING_BINDIR_CROSS}/ \
|
||||
--without-ssl \
|
||||
--without-libssh2 \
|
||||
--with-random=/dev/urandom \
|
||||
--without-libidn \
|
||||
--enable-crypto-auth \
|
||||
"
|
||||
|
||||
do_configure_prepend() {
|
||||
sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
|
||||
}
|
||||
|
||||
PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
|
||||
|
||||
FILES_${PN} = "${bindir}/curl"
|
||||
|
||||
FILES_${PN}-certs = "${datadir}/curl/curl-*"
|
||||
PACKAGE_ARCH_${PN}-certs = "all"
|
||||
|
||||
FILES_${PN}-doc = "${mandir}/man1/curl.1"
|
||||
|
||||
FILES_lib${PN} = "${libdir}/lib*.so.*"
|
||||
RRECOMMENDS_lib${PN} += "${PN}-certs"
|
||||
FILES_lib${PN}-dev = "${includedir} \
|
||||
${libdir}/lib*.so \
|
||||
${libdir}/lib*.a \
|
||||
${libdir}/lib*.la \
|
||||
${libdir}/pkgconfig \
|
||||
${datadir}/aclocal \
|
||||
${bindir}/*-config"
|
||||
|
||||
FILES_lib${PN}-doc = "${mandir}/man3 \
|
||||
${mandir}/man1/curl-config.1"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user