From f561763e9189d668001004f5a603738c1ba7ce7c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 25 Feb 2010 17:27:50 +0100 Subject: [PATCH] gmp/mpfr: make sure host builds add source targets to HOST_SOURCE Closes #1183. When gmp/mpfr is needed for the host (E.G. when using an internal toolchain), the host-lib{gmp,mpfr}-source targets weren't added to HOST_SOURCE, so make source / external-deps didn't handle them. Notice that we have the same issue with the new host package support, there we should probably use HOST__DEPENDENCIES for -source dependencies. Signed-off-by: Peter Korsgaard --- CHANGES | 1 + package/gmp/gmp.mk | 1 + package/mpfr/mpfr.mk | 1 + toolchain/binutils/binutils.mk | 1 + toolchain/gcc/gcc-uclibc-4.x.mk | 1 + 5 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index 402c9473fa..4709fdfe50 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ Issues resolved (http://bugs.uclibc.org): #165: openmotif does not build + #1183: make source fails to download gmp, mpfr and patches 2010.02-rc2, Released February 23th, 2010: diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 7ae78c79d0..a3488b8369 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -93,6 +93,7 @@ $(GMP_HOST_DIR)/lib/libgmp$(HOST_LIBEXT): $(GMP_DIR2)/.configured $(MAKE) -C $(GMP_DIR2) install host-libgmp: $(GMP_HOST_DIR)/lib/$(GMP_HOST_BINARY) +host-libgmp-source: libgmp-source host-libgmp-clean: rm -rf $(GMP_HOST_DIR) -$(MAKE) -C $(GMP_DIR2) clean diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 595edc3cb7..a7834dd9bc 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -107,6 +107,7 @@ $(MPFR_HOST_DIR)/lib/libmpfr$(HOST_LIBEXT): $(MPFR_DIR2)/.configured $(MAKE) -C $(MPFR_DIR2) install host-libmpfr: $(MPFR_HOST_DIR)/lib/$(MPFR_HOST_BINARY) +host-libmpfr-source: libmpfr-source host-libmpfr-clean: rm -rf $(MPFR_HOST_DIR) -$(MAKE) -C $(MPFR_DIR2) clean diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 288a000f5d..77e7d3d518 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -37,6 +37,7 @@ endif ifndef BINUTILS_NO_MPFR BINUTILS_HOST_PREREQ:=$(TOOLCHAIN_DIR)/gmp/lib/libgmp$(HOST_LIBEXT) \ $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT) +HOST_SOURCE += host-libgmp-source host-libmpfr-source BINUTILS_TARGET_PREREQ:=$(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT) \ $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index dcca431dba..cf76e8ad15 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -107,6 +107,7 @@ endif ifndef GCC_NO_MPFR GCC_WITH_HOST_GMP=--with-gmp=$(GMP_HOST_DIR) GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR) +HOST_SOURCE += host-libgmp-source host-libmpfr-source ifeq ($(BR2_INSTALL_FORTRAN),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran -- 2.30.2