From 96b0462f81050cb315eaee15039a1d883fdbbb33 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Mon, 18 Apr 2011 08:47:40 +0200 Subject: [PATCH] Fixed some minor issues in toolchain's Makefile and updated kernel headers to 2.6.35.6 --- Makefile | 10 +++++----- vars.mk | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3949d02..3bc0720 100644 --- a/Makefile +++ b/Makefile @@ -181,7 +181,7 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) --without-headers --enable-__cxa_atexit --enable-symvers=gnu --disable-decimal-float \ --nfp --without-fp --with-softfloat-support=internal \ --disable-libgomp --disable-libmudflap --disable-libssp \ - --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=${CROSSTOOLS} \ + --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \ --disable-shared --disable-threads --enable-languages=c && \ make && make install || exit 1 touch $(CROSSTOOLS)/lib/gcc @@ -200,14 +200,14 @@ $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2: wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2: - wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-ports-$(GLIBC_PORTS_VERSION).tar.bz2 + wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-ports-$(GLIBC_VERSION).tar.bz2 -$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_PORTS_VERSION).tar.bz2 $(WORK)/glibc-$(GLIBC_VERSION)-pot.patch +$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-$(GLIBC_VERSION)-pot.patch tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 cd $(WORK)/glibc-$(GLIBC_VERSION) && \ - tar xvjf $(WORK)/glibc-ports-$(GLIBC_PORTS_VERSION).tar.bz2 && \ + tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \ patch -p1 -i $(WORK)/glibc-$(GLIBC_VERSION)-pot.patch && \ - mv glibc-ports-$(GLIBC_PORTS_VERSION) ports && \ + mv glibc-ports-$(GLIBC_VERSION) ports && \ sed -e 's/-lgcc_eh//g' -i Makeconfig touch $(WORK)/glibc-$(GLIBC_VERSION) diff --git a/vars.mk b/vars.mk index 691efd4..8453672 100644 --- a/vars.mk +++ b/vars.mk @@ -10,13 +10,12 @@ CLFS = $(PWD)/clfs CROSSTOOLS = $(PWD)/crosstools WORK = $(PWD)/work -KERNEL_HEADERS_VERSION = 2.6.30.1 +KERNEL_HEADERS_VERSION = 2.6.35.6 LIBGMP_VERSION = 5.0.1 LIBMPFR_VERSION = 3.0.0 LIBMPC_VERSION = 0.8.2 BINUTILS_VERSION = 2.20.1 GCC_VERSION = 4.5.2 GLIBC_VERSION = 2.12.1 -GLIBC_PORTS_VERSION = 2.12.1 # End of file -- 2.26.2