From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 29 Nov 2009 22:15:55 +0000 (+0100)
Subject: gcc depends on gmp and mpfr.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b05a3ad41b9a65d7559a8f6a6ab43bb9f2ebe42;p=ipfire-3.x.git

gcc depends on gmp and mpfr.
---

diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm
index 37c8265f1..6cd2ba0bb 100644
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@ -40,14 +40,11 @@ define PKG_DESCRIPTION
 endef
 
 PKG_BUILD_DEPS =
-PKG_DEPS      += binutils glibc kernel-headers
+PKG_DEPS      += binutils glibc gmp kernel-headers mpfr
 
 CFLAGS         = -D__USE_XOPEN2K8 -pipe
 CXXFLAGS       =
 
-GMP            = 4.3.1
-MPFR           = 2.4.1
-
 ifeq "$(MACHINE)" "i586"
 	CONFIGURE_ARGS = --disable-decimal-float
 endif
@@ -59,8 +56,6 @@ else
 endif
 
 PKG_TARBALL   += $(THISAPP).tar.bz2
-PKG_OBJECTS   += gmp-$(GMP).tar.bz2
-PKG_OBJECTS   += mpfr-$(MPFR).tar.bz2
 
 PKG_PATCHES   += $(THISAPP)-espf-1.patch \
 	$(THISAPP)-branch-startfiles-1.patch \
@@ -73,14 +68,6 @@ PKG_PATCHES   += $(THISAPP)-espf-1.patch \
 define STAGE_PREPARE_CMDS
 	-mkdir -v $(DIR_SRC)/gcc-build
 
-	# First, unpack gmp and mpfr.
-	# We use the build-"magic" of the gcc build system that we compile libgmp and
-	# libmpfr right (with -fPIC and so on).
-	cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/gmp-$(GMP).tar.bz2
-	cd $(DIR_APP) && ln -svf gmp-* gmp
-	cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/mpfr-$(MPFR).tar.bz2
-	cd $(DIR_APP) && ln -svf mpfr-* mpfr
-
 	# Remove unneeded features that will save some compile time
 	rm -rf $(DIR_APP)/lib{gfortran,java,objc} \
 		$(DIR_APP)/gcc/{fortran,java,objc,objcp}
diff --git a/pkgs/core/gmp/gmp.nm b/pkgs/core/gmp/gmp.nm
index f45cc66af..1a4c630db 100644
--- a/pkgs/core/gmp/gmp.nm
+++ b/pkgs/core/gmp/gmp.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://gmplib.org/
 PKG_LICENSE    = LGPLv3+
 PKG_SUMMARY    = A GNU arbitrary precision library.
 
-PKG_DEPS      += readline
+PKG_BUILD_DEPS:= $(filter-out gcc,$(PKG_BUILD_DEPS))
 
 define PKG_DESCRIPTION
 	The gmp package contains GNU MP, a library for arbitrary precision \