From c93d2c6d15c7b13e569b1a0fcd3989cf6204504f Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 11 Nov 2015 15:05:24 +0100 Subject: [PATCH] libraries.mk: bump version libcurl-7.45.0 --- make/archives.mk | 4 ++-- make/libraries.mk | 8 ++++---- make/versions.mk | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/make/archives.mk b/make/archives.mk index 32f0d2d..ec382ba 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -18,8 +18,8 @@ $(ARCHIVE)/libid3tag-0.15.1b.tar.gz: $(ARCHIVE)/libungif-4.1.4.tar.bz2: $(WGET) http://www.fhloston-paradise.de/libungif-4.1.4.tar.bz2 -$(ARCHIVE)/curl-7.35.0.tar.bz2: - $(WGET) http://www.fhloston-paradise.de/curl-7.35.0.tar.bz2 +$(ARCHIVE)/curl-$(CURL_VER).tar.bz2: + $(WGET) http://curl.haxx.se/download/$(lastword $(subst /, ,$@)) $(ARCHIVE)/libpng-1.6.8.tar.gz: $(WGET) http://www.fhloston-paradise.de/libpng-1.6.8.tar.gz diff --git a/make/libraries.mk b/make/libraries.mk index 9b1a05a..94f3946 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -121,9 +121,9 @@ $(D)/openssl: $(ARCHIVE)/openssl-1.0.1f.tar.gz | $(TARGETPREFIX) chmod 0755 $(TARGETPREFIX)/lib/libcrypto.so.* $(TARGETPREFIX)/lib/libssl.so.* touch $@ -$(D)/libcurl: $(ARCHIVE)/curl-7.35.0.tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib | $(TARGETPREFIX) - $(UNTAR)/curl-7.35.0.tar.bz2 - set -e; cd $(BUILD_TMP)/curl-7.35.0; \ +$(D)/libcurl: $(ARCHIVE)/curl-$(CURL_VER).tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib | $(TARGETPREFIX) + $(UNTAR)/curl-$(CURL_VER).tar.bz2 + set -e; cd $(BUILD_TMP)/curl-$(CURL_VER); \ $(BUILDENV) LIBS="-lssl -lcrypto -lrtmp -lz" \ ./configure \ --prefix=${PREFIX} \ @@ -143,7 +143,7 @@ $(D)/libcurl: $(ARCHIVE)/curl-7.35.0.tar.bz2 $(D)/openssl $(D)/librtmp $(D)/zlib $(REWRITE_LIBTOOL)/libcurl.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcurl.pc rm -rf $(TARGETPREFIX)/.remove - $(REMOVE)/curl-7.35.0 + $(REMOVE)/curl-$(CURL_VER) touch $@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz | $(TARGETPREFIX) diff --git a/make/versions.mk b/make/versions.mk index 4efedf9..a727df7 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -1,4 +1,7 @@ +# curl; command line tool for transferring data with URL syntax +CURL_VER = 7.45.0 + # libupnp; portable Universal Plug and Play (UPnP) needed for ushare LIBUPNP_VER = 1.6.19 -- 2.39.5