Added new section in the Makefile to handle pkgutils-cross in CLFS

[toolchain-softfp.git] / Makefile

diff --git a/Makefile b/Makefile
index 19f51c9140b233e5670b34bdbd875274960376af..1a17dd5317cd5d8a9e2534ee4be27dd4fb403e31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include vars.mk
 
 .PHONY: all clean distclean
 
-all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final test
+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
 
@@ -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 && \
-               patch -p0 -i $(WORK)/glibc-$(GLIBC_VERSION)-pot.patch && \
-               mv glibc-ports-$(GLIBC_PORTS_VERSION) ports && \
+               tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
+               patch -p1 -i $(WORK)/glibc-$(GLIBC_VERSION)-pot.patch && \
+               mv glibc-ports-$(GLIBC_VERSION) ports && \
                sed -e 's/-lgcc_eh//g' -i Makeconfig
        touch $(WORK)/glibc-$(GLIBC_VERSION)
 
@@ -272,6 +272,13 @@ gcc-final-distclean: gcc-final-clean
        rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
 
 
+# SETUP FOR PKGUTILS
+$(CLFS)/var/lib/pkg/db:
+       install -d -m 0755 $(CLFS)/var/lib/pkg
+       touch $(CLFS)/var/lib/pkg/db
+
+setup: $(CLFS)/var/lib/pkg/db
+
 # TEST THE TOOLCHAIN
 $(WORK)/test: $(WORK)/test.c
        export PATH=$$PATH:$(CROSSTOOLS)/bin && \