summaryrefslogtreecommitdiff
path: root/package/gmp
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-06 16:45:41 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-06 16:45:41 +0100
commitff6313ae0ed89f6d86658a001ff9db0177b1f432 (patch)
tree8d0998d6793e608f8e77d442cef3046efe3fc864 /package/gmp
parent729ec728a67374bd4fe682b9868b21863d127457 (diff)
update gmp/mpfr to latest upstream version
Diffstat (limited to 'package/gmp')
-rw-r--r--package/gmp/Makefile4
-rw-r--r--package/gmp/patches/patch-Makefile_am11
-rw-r--r--package/gmp/patches/patch-configure_in21
-rw-r--r--package/gmp/patches/patch-longlong_h11
4 files changed, 12 insertions, 35 deletions
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 2a57980f0..41fd1531f 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:= gmp
PKG_DESCR:= GNU multiprecision arithmetic library
PKG_SECTION:= libs
PKG_URL:= http://gmplib.org/
-PKG_BUILDDEP:= autotool flex-host bison-host
+PKG_BUILDDEP:= flex-host bison-host
PKG_LIBNAME:= libgmp
PKG_OPTS:= dev
@@ -16,8 +16,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-AUTOTOOL_STYLE:= autoreconf
-
libgmp-install:
${INSTALL_DIR} ${IDIR_LIBGMP}/usr/lib
${CP} ${WRKINST}/usr/lib/libgmp.so* ${IDIR_LIBGMP}/usr/lib
diff --git a/package/gmp/patches/patch-Makefile_am b/package/gmp/patches/patch-Makefile_am
deleted file mode 100644
index 5180e545a..000000000
--- a/package/gmp/patches/patch-Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- gmp-4.3.2.orig/Makefile.am 2010-01-07 21:09:02.000000000 +0100
-+++ gmp-4.3.2/Makefile.am 2013-10-29 22:08:10.000000000 +0100
-@@ -25,7 +25,7 @@
- # Makefiles in subdirectories, but here we must omit it so automake gives
- # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
- #
--AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
-+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
-
-
- # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the
diff --git a/package/gmp/patches/patch-configure_in b/package/gmp/patches/patch-configure_in
deleted file mode 100644
index bcf07870f..000000000
--- a/package/gmp/patches/patch-configure_in
+++ /dev/null
@@ -1,21 +0,0 @@
---- gmp-4.3.2.orig/configure.in 2010-01-07 21:09:02.000000000 +0100
-+++ gmp-4.3.2/configure.in 2013-10-29 22:13:19.000000000 +0100
-@@ -65,7 +65,7 @@ dnl
- dnl Note that there's a copy of these options in the top-level Makefile.am,
- dnl so update there too if changing anything.
- dnl
--AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
-+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
- AM_CONFIG_HEADER(config.h:config.in)
- AM_MAINTAINER_MODE
-
-@@ -2072,9 +2072,6 @@ fi
- echo " MPN_PATH=\"$path\""
-
-
--# Automake ansi2knr support.
--AM_C_PROTOTYPES
--
- CL_AS_NOEXECSTACK
-
- GMP_PROG_AR
diff --git a/package/gmp/patches/patch-longlong_h b/package/gmp/patches/patch-longlong_h
new file mode 100644
index 000000000..dd42a0ebc
--- /dev/null
+++ b/package/gmp/patches/patch-longlong_h
@@ -0,0 +1,11 @@
+--- gmp-5.1.3.orig/longlong.h 2013-09-30 12:18:28.000000000 +0200
++++ gmp-5.1.3/longlong.h 2014-01-06 16:07:47.886035812 +0100
+@@ -1230,7 +1230,7 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
+ #define UDIV_TIME 100
+ #endif /* __mips */
+
+-#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
++#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 && defined (_LP64)
+ #if __GMP_GNUC_PREREQ (4,4)
+ #define umul_ppmm(w1, w0, u, v) \
+ do { \