From: wittinobi Date: Wed, 23 May 2012 22:19:10 +0000 (+0200) Subject: update zlib and boost X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=0ec2921a445d7465c106432e14102a9318b8f20b;p=bs-cst-neutrino-hd.git update zlib and boost --- diff --git a/make/archives.mk b/make/archives.mk index 52502e2..3e91d15 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -6,8 +6,8 @@ $(ARCHIVE)/autofs-4.1.4.tar.bz2: $(ARCHIVE)/zlib-1.2.3.tar.bz2: $(WGET) http://www.fhloston-paradise.de/zlib-1.2.3.tar.bz2 -$(ARCHIVE)/zlib-1.2.6.tar.bz2: - $(WGET) http://www.fhloston-paradise.de/zlib-1.2.6.tar.bz2 +$(ARCHIVE)/zlib-1.2.7.tar.bz2: + $(WGET) http://www.fhloston-paradise.de/zlib-1.2.7.tar.bz2 $(ARCHIVE)/libmad-0.15.1b.tar.gz: $(WGET) http://www.dbox2world.net/download/libmad-0.15.1b.tar.gz @@ -57,8 +57,8 @@ $(ARCHIVE)/libjpeg-turbo-1.1.1.tar.gz: $(ARCHIVE)/boost_1_40_0.tar.bz2: $(WGET) http://www.fhloston-paradise.de/boost_1_40_0.tar.bz2 -$(ARCHIVE)/boost_1_47_0.tar.bz2: - $(WGET) http://www.fhloston-paradise.de/boost_1_47_0.tar.bz2 +$(ARCHIVE)/boost_1_49_0.tar.bz2: + $(WGET) http://www.fhloston-paradise.de/boost_1_49_0.tar.bz2 $(ARCHIVE)/openssl-0.9.7.tar.gz: $(WGET) http://www.fhloston-paradise.de/openssl-0.9.7.tar.gz diff --git a/make/libraries.mk b/make/libraries.mk index fe2964e..bcff8dd 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -109,17 +109,17 @@ $(D)/zlib: $(ARCHIVE)/zlib-1.2.3.tar.bz2 | $(TARGETPREFIX) $(REMOVE)/.remove touch $@ -$(D)/zlib-new: $(ARCHIVE)/zlib-1.2.6.tar.bz2 | $(TARGETPREFIX) - $(UNTAR)/zlib-1.2.6.tar.bz2 - cd $(BUILD_TMP)/zlib-1.2.6 && \ +$(D)/zlib-new: $(ARCHIVE)/zlib-1.2.7.tar.bz2 | $(TARGETPREFIX) + $(UNTAR)/zlib-1.2.7.tar.bz2 + cd $(BUILD_TMP)/zlib-1.2.7 && \ sed -i 's/ifdef _LARGEFILE64_SOURCE/ifndef _LARGEFILE64_SOURCE/' zlib.h && \ sed -i 's/-_LARGEFILE64_SOURCE -/defined(_LARGEFILE64_SOURCE) \&\& -_LARGEFILE64_SOURCE -/' zconf.h.in && \ CC=$(TARGET)-gcc mandir=$(BUILD_TMP)/.remove ./configure --prefix= --shared && \ $(MAKE) && \ ln -sf /bin/true ldconfig && \ - PATH=$(BUILD_TMP)/zlib-1.2.6:$(PATH) $(MAKE) install prefix=$(TARGETPREFIX) + PATH=$(BUILD_TMP)/zlib-1.2.7:$(PATH) $(MAKE) install prefix=$(TARGETPREFIX) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/zlib.pc - $(REMOVE)/zlib-1.2.6 + $(REMOVE)/zlib-1.2.7 $(REMOVE)/.remove touch $@ @@ -346,12 +346,12 @@ $(D)/libboost: $(SOURCE_DIR)/svn/THIRDPARTY/libraries/boost_1_33_0 | $(TARGETPRE rm -rf boost_1_33_0 touch $@ -$(D)/libboost-new: $(ARCHIVE)/boost_1_47_0.tar.bz2 | $(TARGETPREFIX) +$(D)/libboost-new: $(ARCHIVE)/boost_1_49_0.tar.bz2 | $(TARGETPREFIX) pushd $(BUILD_TMP) && \ - tar xf $(ARCHIVE)/boost_1_47_0.tar.bz2 boost_1_47_0/boost && \ + tar xf $(ARCHIVE)/boost_1_49_0.tar.bz2 boost_1_49_0/boost && \ rm -rf $(TARGETPREFIX)/include/boost &&\ - mv boost_1_47_0/boost $(TARGETPREFIX)/include/boost && \ - rm -rf boost_1_47_0 + mv boost_1_49_0/boost $(TARGETPREFIX)/include/boost && \ + rm -rf boost_1_49_0 touch $@ $(D)/ffmpeg-old: $(D)/xvidcore $(ARCHIVE)/ffmpeg-0.5.tar.bz2 | $(TARGETPREFIX)