diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/mpfr/PKGBUILD | 17 | ||||
| -rw-r--r-- | core/mpfr/mpfr-3.1.0.p1.patch | 50 |
2 files changed, 59 insertions, 8 deletions
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index 92f8b3d7d..00c4962d9 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 139750 2011-10-04 21:10:35Z allan $ +# $Id: PKGBUILD 140252 2011-10-11 00:43:43Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpfr _pkgver=3.1.0 -pkgver=${_pkgver} -#_patchlevel=p4 -#pkgver=${_pkgver}.${_patchlevel} -pkgrel=2 +_patchlevel=p1 +pkgver=${_pkgver}.${_patchlevel} +pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') url="http://www.mpfr.org/" @@ -15,12 +14,14 @@ license=('LGPL') depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz) -md5sums=('6e495841bb026481567006cec0f821c3') +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz + mpfr-${_pkgver}.${_patchlevel}.patch) +md5sums=('6e495841bb026481567006cec0f821c3' + 'ec988293368d4988c76f50d6a3460166') build() { cd "${srcdir}/${pkgname}-${_pkgver}" - #patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch + patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch ./configure --prefix=/usr --enable-thread-safe --enable-shared make } diff --git a/core/mpfr/mpfr-3.1.0.p1.patch b/core/mpfr/mpfr-3.1.0.p1.patch new file mode 100644 index 000000000..437b1a278 --- /dev/null +++ b/core/mpfr/mpfr-3.1.0.p1.patch @@ -0,0 +1,50 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } |