aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2018-01-17 21:06:19 +0200
committerJohn Crispin <john@phrozen.org>2018-01-18 08:04:18 +0100
commit4343ac5515569e564919e6e828246bf6d8663734 (patch)
tree7cc062f7cdf9ba252ca3fd6c0c229658a7d8a7ed /tools
parentd0610332dc1b6a6e7097ab0420a84051f09c4362 (diff)
downloadupstream-4343ac5515569e564919e6e828246bf6d8663734.tar.gz
upstream-4343ac5515569e564919e6e828246bf6d8663734.tar.bz2
upstream-4343ac5515569e564919e6e828246bf6d8663734.zip
tools/mpfr: update to 4.0.0
Update mpfr to 4.0.0 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'tools')
-rw-r--r--tools/mpfr/Makefile4
-rw-r--r--tools/mpfr/patches/001-only_src.patch14
-rw-r--r--tools/mpfr/patches/100-freebsd-compat.patch2
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/mpfr/Makefile b/tools/mpfr/Makefile
index f3e337ada2..2afb025980 100644
--- a/tools/mpfr/Makefile
+++ b/tools/mpfr/Makefile
@@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mpfr
-PKG_VERSION:=3.1.6
+PKG_VERSION:=4.0.0
PKG_CPE_ID:=cpe:/a:mpfr:gnu_mpfr
PKG_SOURCE_URL:=http://www.mpfr.org/mpfr-$(PKG_VERSION) \
@GNU/mpfr
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=7a62ac1a04408614fccdc506e4844b10cf0ad2c2b1677097f8f35d3a1344a950
+PKG_HASH:=fbe2cd1418b321f5c899ce4f0f0f4e73f5ecc7d02145b0e1fd096f5c3afb8a1d
HOST_BUILD_PARALLEL:=1
HOST_FIXUP:=autoreconf
diff --git a/tools/mpfr/patches/001-only_src.patch b/tools/mpfr/patches/001-only_src.patch
index b983f879c2..019928741a 100644
--- a/tools/mpfr/patches/001-only_src.patch
+++ b/tools/mpfr/patches/001-only_src.patch
@@ -4,19 +4,19 @@
# old Automake version.
ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = doc src tests tune
+-SUBDIRS = doc src tests tune tools/bench
+SUBDIRS = src
- nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \
- examples/ReadMe examples/divworst.c examples/rndo-add.c examples/sample.c \
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = mpfr.pc
--- a/Makefile.in
+++ b/Makefile.in
-@@ -378,7 +378,7 @@ AUTOMAKE_OPTIONS = gnu
+@@ -383,7 +383,7 @@ AUTOMAKE_OPTIONS = gnu
# libtoolize and in case some developer needs to switch back to an
# old Automake version.
ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = doc src tests tune
+-SUBDIRS = doc src tests tune tools/bench
+SUBDIRS = src
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = mpfr.pc
nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \
- examples/ReadMe examples/divworst.c examples/rndo-add.c examples/sample.c \
- examples/version.c
diff --git a/tools/mpfr/patches/100-freebsd-compat.patch b/tools/mpfr/patches/100-freebsd-compat.patch
index fa28a67d95..c357b68736 100644
--- a/tools/mpfr/patches/100-freebsd-compat.patch
+++ b/tools/mpfr/patches/100-freebsd-compat.patch
@@ -1,6 +1,6 @@
--- a/src/vasprintf.c
+++ b/src/vasprintf.c
-@@ -42,6 +42,7 @@ http://www.gnu.org/licenses/ or write to
+@@ -61,6 +61,7 @@ http://www.gnu.org/licenses/ or write to
#endif /* HAVE_VA_COPY */
#ifdef HAVE_WCHAR_H