From 55dc3802e712b64ca8094b5933b6bab2ca3b8416 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 19 Mar 2016 21:56:35 +0100 Subject: [PATCH] fix crosstool.mk for nevis --- make/applications.mk | 1 - make/archives.mk | 1 - make/crosstool.mk | 11 +++-------- make/libraries.mk | 1 - 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index 85be4a6..8b435a3 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -29,7 +29,6 @@ $(D)/busybox: $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(PATCH)/busybox-1.21.1-changing-the-order-sys-tree-is-scanned-with-mdev.diff; \ $(PATCH)/busybox-1.21.1-mdev.diff; \ $(PATCH)/busybox-1.22.1-coolstream.diff; \ - $(PATCH)/busybox-1.24.1-wget.diff; \ cp $(PATCHES)/busybox-1.22.1-hd1.config .config && \ sed -i -e 's#^CONFIG_PREFIX.*#CONFIG_PREFIX="$(TARGETPREFIX)"#' .config && \ $(MAKE) all CROSS_COMPILE=$(TARGET)- CFLAGS_EXTRA="$(TARGET_CFLAGS)" && \ diff --git a/make/archives.mk b/make/archives.mk index 441b4ca..596fee2 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -247,7 +247,6 @@ $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz: $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2: $(WGET) http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-$(CROSSTOOL_NG_VER).tar.bz2 $(WGET) https://releases.linaro.org/15.06/components/toolchain/gcc-linaro/4.9/gcc-linaro-4.9-2015.06.tar.xz - $(WGET) https://ftp.gnu.org/gnu/binutils/binutils-2.24.tar.bz2 $(WGET) http://download.freenas.org/distfiles/mpfr-3.1.2/mpfr-3.1.2.tar.xz $(WGET) http://isl.gforge.inria.fr/isl-0.12.2.tar.bz2 $(WGET) https://distfiles.macports.org/cloog/cloog-0.18.1.tar.gz diff --git a/make/crosstool.mk b/make/crosstool.mk index 1cbcae7..b4bf6b9 100755 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -15,22 +15,18 @@ CROSSTOOL_NG_VER = $(CT_VER_KRONOS) CUSTOM_GCC_VER = $(GCC_VER_KRONOS) endif -ifeq ($(PLATFORM), nevis) ## Platform nevis +CUSTOM_GCC = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz +ifeq ($(PLATFORM), nevis) ## Platform nevis CT_NG_CONFIG = $(PATCHES)/ct-ng-1.20/ct-ng-nevis-1.20.0-1.config -CUSTOM_GCC = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz -crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2 +crosstool: prerequisites | $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2 mkdir -p $(BUILD_TMP); \ $(UNTAR)/crosstool-ng-$(CROSSTOOL_NG_VER).tar.bz2; \ set -e; unset CONFIG_SITE; cd $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_NG_VER); \ mkdir -p targets/src/; \ tar -C $(GIT_KERNEL) -cp linux-$(CST_KERNEL_VERSION)-cnxt --exclude=.git | tar -C $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_NG_VER)/targets/src -x; \ tar cfvj $(BASE_DIR)/download/linux-$(CST_KERNEL_VERSION)-cnxt.tar.bz2 $(GIT_KERNEL)/linux-$(CST_KERNEL_VERSION)-cnxt; \ - if [ $(CST_KERNEL_VERSION) = "2.6.26.8" ]; then \ - cd targets/src/linux-2.6.26.8-cnxt; \ - patch -p1 -i $(PATCHES)/linux-2.6.26.8-rename-getline.patch; \ - fi; \ cd $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_NG_VER); \ \ tar -xf $(PATCHES)/ct-ng-1.20/libstdc++_configure_patch.tar.xz; \ @@ -76,7 +72,6 @@ else CT_NG_CONFIG = $(PATCHES)/ct-ng-1.20/ct-ng-1.20.0-1-glibc.config endif ## ifeq ($(UCLIBC_BUILD), 1) -CUSTOM_GCC = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz make -p $(BUILD_TMP) $(UNTAR)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz diff --git a/make/libraries.mk b/make/libraries.mk index cc64e43..890361a 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -157,7 +157,6 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARG $(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); \ - $(PATCH)/libcurl-7.45.0-url.diff; \ $(BUILDENV) LIBS="-lssl -lcrypto -lrtmp -lz" \ ./configure \ --prefix=${PREFIX} \ -- 2.39.5