Fixed and cleanup libgmp stage in Makefile and config in vars.mk

diff --git a/Makefile b/Makefile
index 0ecebb7705207994662eea18b5faa278589ff9a8..b09b9df5297efeca890ea39ee92b0803a87b7bfe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ include vars.mk
 all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test
 
 clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean
-       rm -rvf $(CROSSTOOLS)/* $(CLFS)/*
+       rm -rvf $(CROSSTOOLS) $(CLFS)
 
 distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean
 
@@ -45,6 +45,7 @@ $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2:
 
 $(WORK)/gmp-$(LIBGMP_VERSION): $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2
        tar -C $(WORK) -xvjf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2
+       mv `find $(WORK) -type d -name 'gmp-*'` $(WORK)/gmp-$(LIBGMP_VERSION)
        touch $(WORK)/gmp-$(LIBGMP_VERSION)
 
 $(WORK)/build-libgmp: $(WORK)/gmp-$(LIBGMP_VERSION)
@@ -55,7 +56,7 @@ $(CROSSTOOLS)/lib/libgmp.so: $(WORK)/build-libgmp
        cd $(WORK)/build-libgmp && \
                unset CFLAGS && unset CXXFLAGS && \
                CPPFLAGS=-fexceptions \
-               $(WORK)/gmp-$(LIBGMP_VERSION_MIN)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \
+               $(WORK)/gmp-$(LIBGMP_VERSION)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \
                make && make install || exit 1
        touch $(CROSSTOOLS)/lib/libgmp.so
 

diff --git a/vars.mk b/vars.mk
index a1946183967a6be02152c8c2a1116e951c7596f8..c648ca8b99b6a44954c97b50b1175da3c665d3c3 100644 (file)
--- a/vars.mk
+++ b/vars.mk
@@ -12,7 +12,6 @@ WORK = $(TOPDIR)/work
 
 KERNEL_HEADERS_VERSION = 3.5.4
 LIBGMP_VERSION = 6.0.0a
-LIBGMP_VERSION_MIN = 6.0.0
 LIBMPFR_VERSION = 3.1.2
 LIBMPC_VERSION = 1.0.2
 BINUTILS_VERSION = 2.24