Merge branch 'master' of git+ssh://openadk.org/git/openadk

10 files changed, 40 insertions, 100 deletions

diff --git a/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
new file mode 100644
index 000000000..021601b7f
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_include_pipe_p_config_h
@@ -0,0 +1,11 @@
+--- Mesa-9.2.2.orig/src/gallium/include/pipe/p_config.h	2013-10-18 00:26:23.000000000 +0200
++++ Mesa-9.2.2/src/gallium/include/pipe/p_config.h	2014-01-06 12:26:04.042469119 +0100
+@@ -126,7 +126,7 @@
+  * Endian detection.
+  */
+ 
+-#ifdef __GLIBC__
++#ifdef __linux__
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
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 {									\
diff --git a/package/mpfr/patches/patch-ltmain_sh b/package/mpfr/patches/patch-ltmain_sh
deleted file mode 100644
index 117f89c34..000000000
--- a/package/mpfr/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpfr-2.4.2.orig/ltmain.sh	2009-11-30 03:43:54.000000000 +0100
-+++ mpfr-2.4.2/ltmain.sh	2011-01-15 14:26:14.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/mpfr/patches/patch-mpfr-longlong_h b/package/mpfr/patches/patch-mpfr-longlong_h
deleted file mode 100644
index 7bf1567ee..000000000
--- a/package/mpfr/patches/patch-mpfr-longlong_h
+++ /dev/null
@@ -1,48 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mpfr-2.4.1.orig/mpfr-longlong.h	2009-02-20 10:43:17.000000000 +0100
-+++ mpfr-2.4.1/mpfr-longlong.h	2009-05-29 15:11:21.000000000 +0200
-@@ -1011,10 +1011,19 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
- #endif /* __m88000__ */
- 
- #if defined (__mips) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if __GMP_GNUC_PREREQ (4,4)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UDItype __ll = (UDItype)(u) * (v);					\
-+    w1 = __ll >> 32;							\
-+    w0 = __ll;								\
-+  } while (0)
-+#endif
-+#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7)
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
--#else
-+#endif
-+#if !defined (umul_ppmm)
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1"				\
- 	   : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
-@@ -1024,10 +1033,20 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
- #endif /* __mips */
- 
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if __GMP_GNUC_PREREQ (4,4)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    typedef unsigned int __ll_UTItype __attribute__((mode(TI)));	\
-+    __ll_UTItype __ll = (__ll_UTItype)(u) * (v);			\
-+    w1 = __ll >> 64;							\
-+    w0 = __ll;								\
-+  } while (0)
-+#endif
-+#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7)
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
--#else
-+#endif
-+#if !defined (umul_ppmm)
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1"				\
- 	   : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
diff --git a/package/mpfr/patches/patch-src_mpfr-longlong_h b/package/mpfr/patches/patch-src_mpfr-longlong_h
new file mode 100644
index 000000000..e68cfa752
--- /dev/null
+++ b/package/mpfr/patches/patch-src_mpfr-longlong_h
@@ -0,0 +1,11 @@
+--- mpfr-3.1.2.orig/src/mpfr-longlong.h	2013-03-13 16:37:32.000000000 +0100
++++ mpfr-3.1.2/src/mpfr-longlong.h	2014-01-06 16:29:39.854354889 +0100
+@@ -1043,7 +1043,7 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
+ #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 {									\
diff --git a/toolchain/gmp/Makefile.inc b/toolchain/gmp/Makefile.inc
index 29d2e2a68..2c7dff360 100644
--- a/toolchain/gmp/Makefile.inc
+++ b/toolchain/gmp/Makefile.inc
@@ -2,9 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		gmp
-PKG_VERSION:=		4.3.2
+PKG_VERSION:=		5.1.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		dd60683d7057917e34630b4a787932e8
+PKG_MD5SUM:=		e5fe367801ff067b923d1e6a126448aa
 PKG_SITES:=		${MASTER_SITE_GNU:=gmp/}
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 GMP_BUILD_DIR:=		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/toolchain/mpfr/Makefile.inc b/toolchain/mpfr/Makefile.inc
index 6f4ed40ef..dbb1064cc 100644
--- a/toolchain/mpfr/Makefile.inc
+++ b/toolchain/mpfr/Makefile.inc
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		mpfr
-PKG_VERSION:=		2.4.2
+PKG_VERSION:=		3.1.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		89e59fe665e2b3ad44a6789f40b059a0
+PKG_MD5SUM:=		e3d203d188b8fe60bb6578dd3152e05c
 PKG_SITES:=		http://www.mpfr.org/mpfr-current/
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz