mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

curl: upgrade to 7.26.0

Browse Source 
Config system changed from 7.24.0 and the noldlibpatch
is no longer needed, thus deleted.

(From OE-Core rev: 0d2d59420b5924491ccd5c091c823b9c277a6721)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexandru DAMIAN
2012-07-04 10:31:18 +03:00
committed by Richard Purdie
parent d0900924a6
commit 460119a5b9
2 changed files with 3 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/curl/curl/noldlibpath.patch
-76
View File
@@ -1,76 +0,0 @@
Upstream-Status: Inappropriate [embedded specific]
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
meta/recipes-support/curl/curl_7.24.0.bb → meta/recipes-support/curl/curl_7.26.0.bb
+3 -4
View File
@@ -8,14 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
DEPENDS = "zlib gnutls"
DEPENDS_virtclass-native = "zlib-native openssl-native"
DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
PR = "r3"
PR = "r0"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://noldlibpath.patch \
file://pkgconfig_fix.patch"
SRC_URI[md5sum] = "f912221d75eb8d8fe08900eaf011b023"
SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16"
SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3"
SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a"
inherit autotools pkgconfig binconfig