From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 12/41] curl: upgrade to 7.26.0
Date: Mon, 9 Jul 2012 08:47:26 -0700 [thread overview]
Message-ID: <8ab79ffc2755930e6f36b94092015adb456f006f.1341802889.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1341802889.git.sgw@linux.intel.com>
In-Reply-To: <cover.1341802889.git.sgw@linux.intel.com>
From: Alexandru DAMIAN <alexandru.damian@intel.com>
Config system changed from 7.24.0 and the noldlibpatch
is no longer needed, thus deleted.
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---
meta/recipes-support/curl/curl/noldlibpath.patch | 76 --------------------
.../curl/{curl_7.24.0.bb => curl_7.26.0.bb} | 7 +-
2 files changed, 3 insertions(+), 80 deletions(-)
delete mode 100644 meta/recipes-support/curl/curl/noldlibpath.patch
rename meta/recipes-support/curl/{curl_7.24.0.bb => curl_7.26.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..0000000
--- 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.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
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
similarity index 90%
rename from meta/recipes-support/curl/curl_7.24.0.bb
rename to meta/recipes-support/curl/curl_7.26.0.bb
index 832254f..f04b400 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.26.0.bb
@@ -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
--
1.7.7.6
next prev parent reply other threads:[~2012-07-09 15:59 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 15:47 [CONSOLIDATED PULL 00/41] Fixes and Updates Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 01/41] directfb: upgrade to 1.6.1 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 02/41] directfb-examples: upgrade to 1.6.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 03/41] libx11: upgrade to 1.5.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 04/41] libx11-trim: " Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 05/41] libx11-diet: " Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 06/41] libxi: upgrade to 1.6.1 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 07/41] xinput: upgrade to 1.6.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 08/41] pixman: upgrade to 0.26.2 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 09/41] recipes.txt: Add entries for "recipes-rt" and "recipes-support" Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 10/41] gcc-common: Don't use "is" for comparing strings, use "==" Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 11/41] gthumb: run make install in parallel Saul Wold
2012-07-09 15:50 ` Burton, Ross
2012-07-09 15:47 ` Saul Wold [this message]
2012-07-09 15:47 ` [CONSOLIDATED PULL 13/41] apt 0.7.14: runtime error: filename too long (tmpdir length) Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 14/41] apt 0.7.14: runtime error: Method file has died unexpectedly Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 15/41] sanity.bbclass: the tmpdir can't be longer than 410 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 16/41] startup-notification: bump PR because libxcb-util soname was changed Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 17/41] matchbox-panel-2: " Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 18/41] runqemu: fix usage() help for MACHINE setting Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 19/41] runqemu: fix support for ext4 rootfs images Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 20/41] classes/license: fix manifest to work with deb Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 21/41] init-install: Use swap_ratio in the calulation of swap_size Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 22/41] init-install: Correct ext2->ext3 typo in logging Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 23/41] init-install: Clean up partition alignment Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 24/41] grub-efi: Do not use help2man Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 25/41] pseudo: Update to 1.3.1 (fixing chroot crash) Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 26/41] utils.bbclass: add helper function to add all multilib variants of a specific package Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 27/41] libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 28/41] gnutls: make sure native is patched for gettext version Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 29/41] populate_sdk_rpm: Sync multilib configuration with rootfs_rpm Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 30/41] multilib: Enable multilib remapping for SDK generation Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 31/41] package_rpm: Avoid duplicate package generation failures Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 32/41] rpm: Fix PACKAGECONFIG dependencies Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 33/41] qemu-0.15.1: add patch to fix compilatation problems on powerpc Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 34/41] packagedata.py: Fix get_subpkgedata_fn for multilib Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 35/41] bluez4: fix packaging issue after update Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 36/41] ncurses: fix packaging issue in multilib build Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 37/41] connman: remove some obviously wrong (circa early-GNOME 2?) directories from FILES Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 38/41] connman: ship the empty plugins directory in the connman package Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 39/41] kernel.bbclass: add non-santized kernel provides Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 40/41] initscripts: use update-alternative to handle file functions Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 41/41] lsbinitscripts: increase ALTERNATIVE_PRIORITY Saul Wold
2012-07-09 16:04 ` [CONSOLIDATED PULL 00/41] Fixes and Updates Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8ab79ffc2755930e6f36b94092015adb456f006f.1341802889.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox