From db18fc42fea152944f30314eceb2773eae266ed5 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Thu, 24 Oct 2019 15:52:01 +0200 Subject: [PATCH] libports: update mpfr to 4.0.2 issue #3537 --- repos/libports/lib/mk/mpfr.mk | 14 +++++++++----- repos/libports/lib/symbols/mpfr | 6 +++--- repos/libports/ports/mpfr.hash | 2 +- repos/libports/ports/mpfr.port | 15 +++++++++------ repos/libports/recipes/api/mpfr/content.mk | 3 +++ 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/repos/libports/lib/mk/mpfr.mk b/repos/libports/lib/mk/mpfr.mk index 5d7b50c64e..028ce155fd 100644 --- a/repos/libports/lib/mk/mpfr.mk +++ b/repos/libports/lib/mk/mpfr.mk @@ -1,14 +1,18 @@ MPFR_PORT_DIR := $(call select_from_ports,mpfr) LIBS = libc gmp -CC_OPT += -DHAVE_STDARG -DHAVE_VA_COPY -DHAVE_INTTYPES_H -INC_DIR += $(REP_DIR)/include/mpfr $(MPFR_PORT_DIR)/include/mpfr -MPFR_SRC_C := $(notdir $(wildcard $(MPFR_PORT_DIR)/src/lib/mpfr/*.c)) -FILTER_OUT := ansi2knr.c jyn_asympt.c round_raw_generic.c speed.c tuneup.c +CC_OPT += -DHAVE_STDARG -DHAVE_VA_COPY -DHAVE_INTTYPES_H -DHAVE_LITTLE_ENDIAN + +INC_DIR += $(REP_DIR)/include/mpfr \ + $(MPFR_PORT_DIR)/include/mpfr \ + $(MPFR_PORT_DIR)/include + +MPFR_SRC_C := $(notdir $(wildcard $(MPFR_PORT_DIR)/src/lib/mpfr/src/*.c)) +FILTER_OUT := jyn_asympt.c round_raw_generic.c SRC_C := $(filter-out $(FILTER_OUT),$(MPFR_SRC_C)) -vpath %.c $(MPFR_PORT_DIR)/src/lib/mpfr +vpath %.c $(MPFR_PORT_DIR)/src/lib/mpfr/src SHARED_LIB = 1 diff --git a/repos/libports/lib/symbols/mpfr b/repos/libports/lib/symbols/mpfr index 613e103d80..93d6e9f53a 100644 --- a/repos/libports/lib/symbols/mpfr +++ b/repos/libports/lib/symbols/mpfr @@ -12,7 +12,7 @@ mpfr_add_ui T mpfr_add_z T mpfr_agm T mpfr_ai T -mpfr_allocate_func B 8 +mpfr_allocate_func B 88 mpfr_asin T mpfr_asinh T mpfr_asprintf T @@ -123,7 +123,7 @@ mpfr_fms T mpfr_fprint_binary T mpfr_frac T mpfr_free_cache T -mpfr_free_func B 8 +mpfr_free_func B 100 mpfr_free_str T mpfr_gamma T mpfr_gamma_one_and_two_third T @@ -337,7 +337,7 @@ mpfr_printf T mpfr_rand_raw T mpfr_rands B 32 mpfr_rands_initialized B 1 -mpfr_reallocate_func B 8 +mpfr_reallocate_func B 104 mpfr_rec_sqrt T mpfr_regular_p T mpfr_reldiff T diff --git a/repos/libports/ports/mpfr.hash b/repos/libports/ports/mpfr.hash index 3121556507..43f62bd93d 100644 --- a/repos/libports/ports/mpfr.hash +++ b/repos/libports/ports/mpfr.hash @@ -1 +1 @@ -9055b2ad7de47518b84a4e213c65d43d4ffd146b +9237712a91c7c913dff2578bbc906192c7f67ab7 diff --git a/repos/libports/ports/mpfr.port b/repos/libports/ports/mpfr.port index cd9ca8e46d..43e14632ae 100644 --- a/repos/libports/ports/mpfr.port +++ b/repos/libports/ports/mpfr.port @@ -1,20 +1,23 @@ LICENSE := GPLv3 -VERSION := 3.0.0 +VERSION := 4.0.2 DOWNLOADS := mpfr.archive -URL(mpfr) := https://gforge.inria.fr/frs/download.php/file/27104/mpfr-3.0.0.tar.xz -SHA(mpfr) := 22de51fee8ccfae75eaea85938acf8c9d8e9415269d9abb7ced52ebf0a29b5d8 +URL(mpfr) := https://gforge.inria.fr/frs/download.php/file/37888/mpfr-4.0.2.tar.xz +SHA(mpfr) := 1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a SIG(mpfr) := ${URL(mpfr)}.asc KEY(mpfr) := GNU DIR(mpfr) := src/lib/mpfr TAR_OPT(mpfr) := --strip-components=1 -DIRS := include/mpfr -DIR_CONTENT(include/mpfr) := src/lib/mpfr/mpfr.h +DIRS := include/mpfr include/generic include/arm include/x86 +DIR_CONTENT(include/mpfr) := src/lib/mpfr/src/mpfr.h +DIR_CONTENT(include/generic) := src/lib/mpfr/src/generic/* +DIR_CONTENT(include/arm) := src/lib/mpfr/src/generic/* +DIR_CONTENT(include/x86) := src/lib/mpfr/src/generic/* default: include/mpfr/mparam.h include/mpfr/mparam.h: _dirs @$(MSG_INSTALL)$@ - @cp src/lib/mpfr/mparam_h.in $@ + @cp src/lib/mpfr/src/mparam_h.in $@ diff --git a/repos/libports/recipes/api/mpfr/content.mk b/repos/libports/recipes/api/mpfr/content.mk index 7658e09c14..7bac2f240a 100644 --- a/repos/libports/recipes/api/mpfr/content.mk +++ b/repos/libports/recipes/api/mpfr/content.mk @@ -5,6 +5,9 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/mpfr) include: mkdir $@ cp -r $(PORT_DIR)/include/mpfr/* $@/ + cp -r $(PORT_DIR)/include/generic $@/ + cp -r $(PORT_DIR)/include/arm $@/ + cp -r $(PORT_DIR)/include/x86 $@/ lib/symbols/mpfr: $(mirror_from_rep_dir)