Re: [OE-core] [PATCH] curl: Update to version 7.25.0
On Wed, May 23, 2012 at 7:12 AM, Saul Wold wrote: > > You should explain why you are removing a patch, I see from the Curl > archives they picked up a similar patch. I also note that this patch slips > in the following: > -+AC_SUBST(GNUTLS_REQUIRED) > > Not sure if you missed that, it might still be needed. I think that hunk is unneeded in this patch. I dont see any connection of this hunk to what this patch was doing it defines GNUTLS_REQUIRED but does not use it. Its safe to delete it. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] curl: Update to version 7.25.0
considering this context, can someone provide more information about AC_SUBST(GNUTLS_REQUIRED). I'm digging into this issue to check whether we still need this or not, but additional info would be appreciated. Radu On 05/24/2012 09:32 AM, Radu Moisan wrote: sorry I should have put a comment about that. that patch is already in upstream, that's why I removed it. Radu On 05/23/2012 05:12 PM, Saul Wold wrote: Radu, You should explain why you are removing a patch, I see from the Curl archives they picked up a similar patch. I also note that this patch slips in the following: -+AC_SUBST(GNUTLS_REQUIRED) Not sure if you missed that, it might still be needed. Sau! On 05/23/2012 01:20 AM, Radu Moisan wrote: Signed-off-by: Radu Moisan --- meta/recipes-support/curl/curl/noldlibpath.patch | 76 .../curl/{curl_7.24.0.bb => curl_7.25.0.bb}|5 +- 2 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-support/curl/curl/noldlibpath.patch rename meta/recipes-support/curl/{curl_7.24.0.bb => curl_7.25.0.bb} (90%) diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch deleted file mode 100644 index f4c72a1..000 --- a/meta/recipes-support/curl/curl/noldlibpath.patch +++ /dev/null @@ -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.ac2010-06-09 11:06:30.0 +0100 -+++ curl-7.20.0/configure.ac2010-06-09 11:04:25.0 +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 diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.25.0.bb similarity index 90% rename from meta/recipes-support/curl/curl_7.24.0.bb rename to meta/recipes-support/curl/curl_7.25.0.bb index 12e95c9..033f1bc 100644 --- a/meta/recipes-support/curl/curl_7.24.0.bb +++ b/meta/recipes-support/curl/curl_7.25.0.bb @@ -11,11 +11,10 @@ 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" -SRC_URI[md5sum] = "f912221d75eb8d8fe08900eaf011b023" -SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16" +SRC_URI[md5sum] = "f0303d47d9d3e6e4f08c2863c6504823" +SRC_URI[sha256sum] = "cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491" inherit au
Re: [OE-core] [PATCH] curl: Update to version 7.25.0
sorry I should have put a comment about that. that patch is already in upstream, that's why I removed it. Radu On 05/23/2012 05:12 PM, Saul Wold wrote: Radu, You should explain why you are removing a patch, I see from the Curl archives they picked up a similar patch. I also note that this patch slips in the following: -+AC_SUBST(GNUTLS_REQUIRED) Not sure if you missed that, it might still be needed. Sau! On 05/23/2012 01:20 AM, Radu Moisan wrote: Signed-off-by: Radu Moisan --- meta/recipes-support/curl/curl/noldlibpath.patch | 76 .../curl/{curl_7.24.0.bb => curl_7.25.0.bb}|5 +- 2 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-support/curl/curl/noldlibpath.patch rename meta/recipes-support/curl/{curl_7.24.0.bb => curl_7.25.0.bb} (90%) diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch deleted file mode 100644 index f4c72a1..000 --- a/meta/recipes-support/curl/curl/noldlibpath.patch +++ /dev/null @@ -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.ac2010-06-09 11:06:30.0 +0100 -+++ curl-7.20.0/configure.ac2010-06-09 11:04:25.0 +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 diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.25.0.bb similarity index 90% rename from meta/recipes-support/curl/curl_7.24.0.bb rename to meta/recipes-support/curl/curl_7.25.0.bb index 12e95c9..033f1bc 100644 --- a/meta/recipes-support/curl/curl_7.24.0.bb +++ b/meta/recipes-support/curl/curl_7.25.0.bb @@ -11,11 +11,10 @@ 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" -SRC_URI[md5sum] = "f912221d75eb8d8fe08900eaf011b023" -SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16" +SRC_URI[md5sum] = "f0303d47d9d3e6e4f08c2863c6504823" +SRC_URI[sha256sum] = "cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491" inherit autotools pkgconfig binconfig ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] curl: Update to version 7.25.0
Radu, You should explain why you are removing a patch, I see from the Curl archives they picked up a similar patch. I also note that this patch slips in the following: -+AC_SUBST(GNUTLS_REQUIRED) Not sure if you missed that, it might still be needed. Sau! On 05/23/2012 01:20 AM, Radu Moisan wrote: Signed-off-by: Radu Moisan --- meta/recipes-support/curl/curl/noldlibpath.patch | 76 .../curl/{curl_7.24.0.bb => curl_7.25.0.bb}|5 +- 2 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-support/curl/curl/noldlibpath.patch rename meta/recipes-support/curl/{curl_7.24.0.bb => curl_7.25.0.bb} (90%) diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch deleted file mode 100644 index f4c72a1..000 --- a/meta/recipes-support/curl/curl/noldlibpath.patch +++ /dev/null @@ -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.0 +0100 -+++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.0 +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 diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.25.0.bb similarity index 90% rename from meta/recipes-support/curl/curl_7.24.0.bb rename to meta/recipes-support/curl/curl_7.25.0.bb index 12e95c9..033f1bc 100644 --- a/meta/recipes-support/curl/curl_7.24.0.bb +++ b/meta/recipes-support/curl/curl_7.25.0.bb @@ -11,11 +11,10 @@ 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" -SRC_URI[md5sum] = "f912221d75eb8d8fe08900eaf011b023" -SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16" +SRC_URI[md5sum] = "f0303d47d9d3e6e4f08c2863c6504823" +SRC_URI[sha256sum] = "cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491" inherit autotools pkgconfig binconfig ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: Update to version 7.25.0
Signed-off-by: Radu Moisan --- meta/recipes-support/curl/curl/noldlibpath.patch | 76 .../curl/{curl_7.24.0.bb => curl_7.25.0.bb}|5 +- 2 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-support/curl/curl/noldlibpath.patch rename meta/recipes-support/curl/{curl_7.24.0.bb => curl_7.25.0.bb} (90%) diff --git a/meta/recipes-support/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch deleted file mode 100644 index f4c72a1..000 --- a/meta/recipes-support/curl/curl/noldlibpath.patch +++ /dev/null @@ -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.0 +0100 -+++ curl-7.20.0/configure.ac 2010-06-09 11:04:25.0 +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 diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.25.0.bb similarity index 90% rename from meta/recipes-support/curl/curl_7.24.0.bb rename to meta/recipes-support/curl/curl_7.25.0.bb index 12e95c9..033f1bc 100644 --- a/meta/recipes-support/curl/curl_7.24.0.bb +++ b/meta/recipes-support/curl/curl_7.25.0.bb @@ -11,11 +11,10 @@ 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" -SRC_URI[md5sum] = "f912221d75eb8d8fe08900eaf011b023" -SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16" +SRC_URI[md5sum] = "f0303d47d9d3e6e4f08c2863c6504823" +SRC_URI[sha256sum] = "cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491" inherit autotools pkgconfig binconfig -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core