From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-we0-f172.google.com ([74.125.82.172]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SYzIJ-00089j-25 for ptxdist@pengutronix.de; Mon, 28 May 2012 14:43:45 +0200 Received: by mail-we0-f172.google.com with SMTP id b13so2404447wer.31 for ; Mon, 28 May 2012 05:43:30 -0700 (PDT) From: "Bart vdr. Meulen" Date: Mon, 28 May 2012 14:42:58 +0200 Message-Id: <1338208981-8681-32-git-send-email-bartvdrmeulen@gmail.com> Subject: [ptxdist] [PATCH 1/2] libcurl: version bump to 7.21.2 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de From: "Bart vdr. Meulen" bump libcurl to version 7.21.2 Signed-off-by: Bart vdr. Meulen --- .../0001-curl-config.in-add-SYSROOT-support.patch | 33 -------------------- patches/curl-7.21.0/series | 1 - .../0001-curl-config.in-add-SYSROOT-support.patch | 33 ++++++++++++++++++++ patches/curl-7.21.2/series | 1 + rules/libcurl.make | 6 ++-- 5 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 patches/curl-7.21.0/0001-curl-config.in-add-SYSROOT-support.patch delete mode 100644 patches/curl-7.21.0/series create mode 100644 patches/curl-7.21.2/0001-curl-config.in-add-SYSROOT-support.patch create mode 100644 patches/curl-7.21.2/series diff --git a/patches/curl-7.21.0/0001-curl-config.in-add-SYSROOT-support.patch b/patches/curl-7.21.0/0001-curl-config.in-add-SYSROOT-support.patch deleted file mode 100644 index e21f2ab..0000000 --- a/patches/curl-7.21.0/0001-curl-config.in-add-SYSROOT-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9917e03c4d0441a9bc73a7a48664a63cb3beb71d Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Sat, 9 Jan 2010 19:25:26 +0100 -Subject: [PATCH 2/2] curl-config.in: add SYSROOT support - -Signed-off-by: Marc Kleine-Budde ---- - curl-config.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/curl-config.in -+++ b/curl-config.in -@@ -123,16 +123,16 @@ while test $# -gt 0; do - ;; - - --cflags) -- if test "X@includedir@" = "X/usr/include"; then -+ if test "X${SYSROOT}@includedir@" = "X/usr/include"; then - echo "" - else -- echo "-I@includedir@" -+ echo "-I${SYSROOT}@includedir@" - fi - ;; - - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-L@libdir@ " -+ if test "X${SYSROOT}@libdir@" != "X/usr/lib" -a "X${SYSROOT}@libdir@" != "X/usr/lib64"; then -+ CURLLIBDIR="-L${SYSROOT}@libdir@ " - else - CURLLIBDIR="" - fi diff --git a/patches/curl-7.21.0/series b/patches/curl-7.21.0/series deleted file mode 100644 index f558799..0000000 --- a/patches/curl-7.21.0/series +++ /dev/null @@ -1 +0,0 @@ -0001-curl-config.in-add-SYSROOT-support.patch diff --git a/patches/curl-7.21.2/0001-curl-config.in-add-SYSROOT-support.patch b/patches/curl-7.21.2/0001-curl-config.in-add-SYSROOT-support.patch new file mode 100644 index 0000000..e21f2ab --- /dev/null +++ b/patches/curl-7.21.2/0001-curl-config.in-add-SYSROOT-support.patch @@ -0,0 +1,33 @@ +From 9917e03c4d0441a9bc73a7a48664a63cb3beb71d Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde +Date: Sat, 9 Jan 2010 19:25:26 +0100 +Subject: [PATCH 2/2] curl-config.in: add SYSROOT support + +Signed-off-by: Marc Kleine-Budde +--- + curl-config.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/curl-config.in ++++ b/curl-config.in +@@ -123,16 +123,16 @@ while test $# -gt 0; do + ;; + + --cflags) +- if test "X@includedir@" = "X/usr/include"; then ++ if test "X${SYSROOT}@includedir@" = "X/usr/include"; then + echo "" + else +- echo "-I@includedir@" ++ echo "-I${SYSROOT}@includedir@" + fi + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then +- CURLLIBDIR="-L@libdir@ " ++ if test "X${SYSROOT}@libdir@" != "X/usr/lib" -a "X${SYSROOT}@libdir@" != "X/usr/lib64"; then ++ CURLLIBDIR="-L${SYSROOT}@libdir@ " + else + CURLLIBDIR="" + fi diff --git a/patches/curl-7.21.2/series b/patches/curl-7.21.2/series new file mode 100644 index 0000000..f558799 --- /dev/null +++ b/patches/curl-7.21.2/series @@ -0,0 +1 @@ +0001-curl-config.in-add-SYSROOT-support.patch diff --git a/rules/libcurl.make b/rules/libcurl.make index 58ff053..b9e68f1 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -17,13 +17,14 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl # # Paths and names # -LIBCURL_VERSION := 7.21.0 -LIBCURL_MD5 := 6dfb911a254a1b5ca8b534b98f2196aa +LIBCURL_VERSION := 7.21.2 +LIBCURL_MD5 := dfa71ade8d02f4588efaf08489e4626c LIBCURL := curl-$(LIBCURL_VERSION) LIBCURL_SUFFIX := tar.gz LIBCURL_URL := http://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) LIBCURL_SOURCE := $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX) LIBCURL_DIR := $(BUILDDIR)/$(LIBCURL) +LIBCURL_LICENSE := MIT/X # ---------------------------------------------------------------------------- # Get @@ -53,7 +54,6 @@ LIBCURL_AUTOCONF := \ --disable-ldaps \ --disable-dict \ --disable-telnet \ - --disable-tftp \ --disable-manual \ \ --disable-ares \ -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de