summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-10-31 06:52:26 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-10-31 06:52:26 +0000
commitebc4ad1e982ee9798d917e1e675ec1b41f03abeb (patch)
treea03bc5948659b7e0c651975232fe21b5b2ac06d0 /package
parent987819ac1ef56d4a610cd4e01f80b357c1b258ee (diff)
downloadbuildroot-novena-ebc4ad1e982ee9798d917e1e675ec1b41f03abeb.tar.gz
buildroot-novena-ebc4ad1e982ee9798d917e1e675ec1b41f03abeb.zip
Cleanup logic of mpfr build, and patch using recommended switches
Diffstat (limited to 'package')
-rw-r--r--package/mpfr/mpfr.mk30
1 files changed, 12 insertions, 18 deletions
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 94d6ef499..e156a7db3 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -14,35 +14,25 @@ MPFR_TARGET_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION)
MPFR_BINARY:=libmpfr$(LIBTGTEXT)
MPFR_HOST_BINARY:=libmpfr$(HOST_SHREXT)
MPFR_LIBVERSION:=1.0.1
+#MPFR_SVN_CMD:=svn co svn://scm.gforge.inria.fr/svn/mpfr/branches/2.3 mpfr-2.3
-# No patch
-ifeq ($(MPFR_PATCH),)
-$(DL_DIR)/$(MPFR_SOURCE):
- $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE)
-
-libmpfr-source: $(DL_DIR)/$(MPFR_SOURCE)
-endif
# need patch
ifneq ($(MPFR_PATCH),)
-$(DL_DIR)/$(MPFR_SOURCE):
- $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE)
+MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE)
-$(DL_DIR)/$(MPFR_PATCH_FILE):
+$(MPFR_PATCH_SOURCE):
$(WGET) -O $@ $(MPFR_SITE)/$(MPFR_PATCH)
-
-libmpfr-source: $(DL_DIR)/$(MPFR_SOURCE) $(DL_DIR)/$(MPFR_PATCH_FILE)
endif
-ifeq ($(MPFR_PATCH),)
-$(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE)
-else
-$(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(DL_DIR)/$(MPFR_PATCH_FILE)
-endif
+$(DL_DIR)/$(MPFR_SOURCE):
+ $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE)
+
+$(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)
$(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(MPFR_DIR) package/mpfr/ \*.patch
$(CONFIG_UPDATE) $(MPFR_DIR)
ifneq ($(MPFR_PATCH),)
- ( cd $(MPFR_DIR); patch -p1 < $(DL_DIR)/$(MPFR_PATCH_FILE); )
+ ( cd $(MPFR_DIR); patch -p1 -N -Z < $(MPFR_PATCH_SOURCE); )
endif
touch $@
@@ -77,6 +67,10 @@ ifeq ($(BR2_PACKAGE_LIBMPFR_HEADERS),y)
$(TARGET_DIR)/usr/include/
endif
+.PHONY: libmpfr-source
+
+libmpfr-source: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE)
+
libmpfr: uclibc $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT)
stage-libmpfr: uclibc $(STAGING_DIR)/usr/lib/$(MPFR_BINARY)