From: wittinobi Date: Mon, 14 May 2012 13:04:49 +0000 (+0200) Subject: Abgleich der lib- und tool-versionen mit Coolstream Original X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=fd6e6d3490e752befa8201a902a1d3786ea5160a;p=bs-cst-neutrino-hd.git Abgleich der lib- und tool-versionen mit Coolstream Original --- diff --git a/make/applications.mk b/make/applications.mk index e94b1a8..90582fe 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -109,7 +109,7 @@ $(D)/procps: $(D)/libncurses $(ARCHIVE)/procps-3.2.7.tar.gz | $(TARGETPREFIX) $(REMOVE)/procps-3.2.7 touch $@ -$(D)/procps-new: $(D)/libncurses $(ARCHIVE)/procps-3.2.8.tar.gz | $(TARGETPREFIX) +$(D)/procps-new: $(D)/libncurses-new $(ARCHIVE)/procps-3.2.8.tar.gz | $(TARGETPREFIX) $(UNTAR)/procps-3.2.8.tar.gz pushd $(BUILD_TMP)/procps-3.2.8 && \ $(PATCH)/procps-3.2.7-avoid-ICE-with-gcc-4.3.2-arm.diff && \ @@ -520,6 +520,31 @@ $(D)/samba: $(D)/libiconv $(ARCHIVE)/samba-3.3.9.tar.gz | $(TARGETPREFIX) $(REMOVE)/samba-3.3.9 touch $@ +$(D)/samba-new: $(D)/libiconv-new $(ARCHIVE)/samba-3.3.9.tar.gz | $(TARGETPREFIX) + $(UNTAR)/samba-3.3.9.tar.gz + cd $(BUILD_TMP)/samba-3.3.9 && \ + $(PATCH)/samba-3.3.9.diff && \ + cd source && \ + export CONFIG_SITE=$(PATCHES)/samba-3.3.9-config.site && \ + ./autogen.sh && \ + $(CONFIGURE) --build=$(BUILD) --host=$(TARGET) --target=$(TARGET) \ + --prefix= --mandir=/.remove \ + --sysconfdir=/etc/samba \ + --with-configdir=/etc/samba \ + --with-privatedir=/etc/samba \ + --with-modulesdir=/lib/samba \ + --datadir=/var/samba \ + --localstatedir=/var/samba \ + --with-piddir=/tmp \ + --with-libiconv=/lib \ + --with-cifsumount --without-krb5 --without-ldap --without-ads --disable-cups --disable-swat \ + && \ + $(MAKE) && \ + $(MAKE) install DESTDIR=$(TARGETPREFIX) + rm -f -r $(TARGETPREFIX)/.remove + $(REMOVE)/samba-3.3.9 + touch $@ + $(D)/qtweb: $(ARCHIVE)/qt-everywhere-opensource-src-4.6.3.tar.gz | $(TARGETPREFIX) $(UNTAR)/qt-everywhere-opensource-src-4.6.3.tar.gz mkdir $(BUILD_TMP)/qt-everywhere-opensource-src-4.6.3/mkspecs/qws/linux-cx2450x-g++ diff --git a/make/archives.mk b/make/archives.mk index f4dd3d0..ca4fddb 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -27,8 +27,8 @@ $(ARCHIVE)/libungif-4.1.3.tar.bz2: $(ARCHIVE)/libungif-4.1.4.tar.bz2: $(WGET) http://www.dbox2world.net/download/libungif-4.1.4.tar.bz2 -$(ARCHIVE)/curl-7.19.7.tar.bz2: - $(WGET) http://www.fhloston-paradise.de/curl-7.19.7.tar.bz2 +$(ARCHIVE)/curl-7.19.5.tar.bz2: + $(WGET) http://www.fhloston-paradise.de/curl-7.19.5.tar.bz2 $(ARCHIVE)/curl-7.25.0.tar.bz2: $(WGET) http://www.fhloston-paradise.de/curl-7.25.0.tar.bz2 @@ -42,8 +42,8 @@ $(ARCHIVE)/libpng-1.5.6.tar.gz: $(ARCHIVE)/fbshot-0.3.tar.gz: $(WGET) http://www.dbox2world.net/download/fbshot-0.3.tar.gz -$(ARCHIVE)/freetype-2.3.11.tar.bz2: - $(WGET) http://www.fhloston-paradise.de/freetype-2.3.11.tar.bz2 +$(ARCHIVE)/freetype-2.3.9.tar.bz2: + $(WGET) http://www.fhloston-paradise.de/freetype-2.3.9.tar.bz2 $(ARCHIVE)/freetype-2.4.9.tar.bz2: $(WGET) http://www.fhloston-paradise.de/freetype-2.4.9.tar.bz2 @@ -84,6 +84,9 @@ $(ARCHIVE)/libogg-1.3.0.tar.gz: $(ARCHIVE)/libvorbis-1.3.2.tar.bz2: $(WGET) http://www.fhloston-paradise.de/libvorbis-1.3.2.tar.bz2 +$(ARCHIVE)/ncurses-5.6.tar.gz: + $(WGET) http://www.fhloston-paradise.de/ncurses-5.6.tar.gz + $(ARCHIVE)/ncurses-5.9.tar.gz: $(WGET) http://www.dbox2world.net/download/ncurses-5.9.tar.gz diff --git a/make/libraries.mk b/make/libraries.mk index 2cf32bd..6626ca6 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -12,7 +12,21 @@ ncurses-prereq: false; \ fi -$(D)/libncurses: $(ARCHIVE)/ncurses-5.9.tar.gz ncurses-prereq | $(TARGETPREFIX) +$(D)/libncurses: $(ARCHIVE)/ncurses-5.6.tar.gz ncurses-prereq | $(TARGETPREFIX) + $(UNTAR)/ncurses-5.6.tar.gz && \ + pushd $(BUILD_TMP)/ncurses-5.6 && \ + $(CONFIGURE) --build=$(BUILD) --host=$(TARGET) --target=$(TARGET) \ + --prefix= --with-terminfo-dirs=/usr/share/terminfo \ + --disable-big-core --without-debug --without-progs --without-ada --with-shared \ + --without-profile --disable-rpath --without-cxx-binding \ + --with-fallbacks='linux vt100 xterm' && \ + $(MAKE) libs HOSTCC=gcc HOSTLDFLAGS="$(TARGET_LDFLAGS)" \ + HOSTCCFLAGS="$(TARGET_CFLAGS) -DHAVE_CONFIG_H -I../ncurses -DNDEBUG -D_GNU_SOURCE -I../include" && \ + $(MAKE) install.libs DESTDIR=$(TARGETPREFIX) + $(REMOVE)/ncurses-5.6 + touch $@ + +$(D)/libncurses-new: $(ARCHIVE)/ncurses-5.9.tar.gz ncurses-prereq | $(TARGETPREFIX) $(UNTAR)/ncurses-5.9.tar.gz && \ pushd $(BUILD_TMP)/ncurses-5.9 && \ $(CONFIGURE) --build=$(BUILD) --host=$(TARGET) --target=$(TARGET) \ @@ -204,9 +218,9 @@ $(D)/openssl-new-test: $(ARCHIVE)/openssl-1.0.0e.tar.gz | $(TARGETPREFIX) chmod 0755 $(TARGETPREFIX)/lib/libcrypto.so.* $(TARGETPREFIX)/lib/libssl.so.* touch $@ -$(D)/libcurl: $(ARCHIVE)/curl-7.19.7.tar.bz2 | $(TARGETPREFIX) - $(UNTAR)/curl-7.19.7.tar.bz2 - pushd $(BUILD_TMP)/curl-7.19.7 && \ +$(D)/libcurl: $(ARCHIVE)/curl-7.19.5.tar.bz2 | $(TARGETPREFIX) + $(UNTAR)/curl-7.19.5.tar.bz2 + pushd $(BUILD_TMP)/curl-7.19.5 && \ $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) --with-random --mandir=/.remove && \ $(MAKE) all && \ mkdir -p $(HOSTPREFIX)/bin && \ @@ -217,7 +231,7 @@ $(D)/libcurl: $(ARCHIVE)/curl-7.19.7.tar.bz2 | $(TARGETPREFIX) $(REWRITE_LIBTOOL)/libcurl.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcurl.pc rm -rf $(TARGETPREFIX)/.remove - $(REMOVE)/curl-7.19.7 + $(REMOVE)/curl-7.19.5 touch $@ $(D)/libcurl-new: $(ARCHIVE)/curl-7.25.0.tar.bz2 | $(TARGETPREFIX) @@ -239,9 +253,9 @@ $(D)/libcurl-new: $(ARCHIVE)/curl-7.25.0.tar.bz2 | $(TARGETPREFIX) $(REMOVE)/curl-7.25.0 touch $@ -$(D)/freetype: $(D)/libpng $(ARCHIVE)/freetype-2.3.11.tar.bz2 | $(TARGETPREFIX) - $(UNTAR)/freetype-2.3.11.tar.bz2 - pushd $(BUILD_TMP)/freetype-2.3.11 && \ +$(D)/freetype: $(D)/libpng $(ARCHIVE)/freetype-2.3.9.tar.bz2 | $(TARGETPREFIX) + $(UNTAR)/freetype-2.3.9.tar.bz2 + pushd $(BUILD_TMP)/freetype-2.3.9 && \ patch -p1 < $(PATCHES)/freetype-2.3.9-coolstream.diff && \ $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) && \ $(MAKE) all && \ @@ -251,7 +265,7 @@ $(D)/freetype: $(D)/libpng $(ARCHIVE)/freetype-2.3.11.tar.bz2 | $(TARGETPREFIX) rm $(TARGETPREFIX)/bin/freetype-config $(REWRITE_LIBTOOL)/libfreetype.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/freetype2.pc - $(REMOVE)/freetype-2.3.11 + $(REMOVE)/freetype-2.3.9 touch $@ $(D)/freetype-new: $(D)/libpng-new $(ARCHIVE)/freetype-2.4.9.tar.bz2 | $(TARGETPREFIX)