Date: Monday, October 10, 2011 @ 20:43:43 Author: allan Revision: 140252
db-move: moved mpfr from [testing] to [core] (x86_64) Added: mpfr/repos/core-x86_64/PKGBUILD (from rev 140250, mpfr/repos/testing-x86_64/PKGBUILD) mpfr/repos/core-x86_64/mpfr-3.1.0.p1.patch (from rev 140250, mpfr/repos/testing-x86_64/mpfr-3.1.0.p1.patch) mpfr/repos/core-x86_64/mpfr.install (from rev 140250, mpfr/repos/testing-x86_64/mpfr.install) Deleted: mpfr/repos/core-x86_64/PKGBUILD mpfr/repos/core-x86_64/mpfr.install mpfr/repos/testing-x86_64/ ---------------------+ PKGBUILD | 73 +++++++++++++++++++++++++------------------------- mpfr-3.1.0.p1.patch | 50 ++++++++++++++++++++++++++++++++++ mpfr.install | 40 +++++++++++++-------------- 3 files changed, 107 insertions(+), 56 deletions(-) Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2011-10-11 00:43:42 UTC (rev 140251) +++ core-x86_64/PKGBUILD 2011-10-11 00:43:43 UTC (rev 140252) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Allan McRae <al...@archlinux.org> -# Contributor: damir <da...@archlinux.org> - -pkgname=mpfr -_pkgver=3.1.0 -pkgver=${_pkgver} -#_patchlevel=p4 -#pkgver=${_pkgver}.${_patchlevel} -pkgrel=2 -pkgdesc="Multiple-precision floating-point library" -arch=('i686' 'x86_64') -url="http://www.mpfr.org/" -license=('LGPL') -depends=('gmp>=5.0') -options=('!libtool') -install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz) -md5sums=('6e495841bb026481567006cec0f821c3') - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - #patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch - ./configure --prefix=/usr --enable-thread-safe --enable-shared - make -} - -check() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: mpfr/repos/core-x86_64/PKGBUILD (from rev 140250, mpfr/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2011-10-11 00:43:43 UTC (rev 140252) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Allan McRae <al...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=mpfr +_pkgver=3.1.0 +_patchlevel=p1 +pkgver=${_pkgver}.${_patchlevel} +pkgrel=1 +pkgdesc="Multiple-precision floating-point library" +arch=('i686' 'x86_64') +url="http://www.mpfr.org/" +license=('LGPL') +depends=('gmp>=5.0') +options=('!libtool') +install=mpfr.install +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 + ./configure --prefix=/usr --enable-thread-safe --enable-shared + make +} + +check() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${_pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: mpfr/repos/core-x86_64/mpfr-3.1.0.p1.patch (from rev 140250, mpfr/repos/testing-x86_64/mpfr-3.1.0.p1.patch) =================================================================== --- core-x86_64/mpfr-3.1.0.p1.patch (rev 0) +++ core-x86_64/mpfr-3.1.0.p1.patch 2011-10-11 00:43:43 UTC (rev 140252) @@ -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"; + } Deleted: core-x86_64/mpfr.install =================================================================== --- core-x86_64/mpfr.install 2011-10-11 00:43:42 UTC (rev 140251) +++ core-x86_64/mpfr.install 2011-10-11 00:43:43 UTC (rev 140252) @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(mpfr.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} Copied: mpfr/repos/core-x86_64/mpfr.install (from rev 140250, mpfr/repos/testing-x86_64/mpfr.install) =================================================================== --- core-x86_64/mpfr.install (rev 0) +++ core-x86_64/mpfr.install 2011-10-11 00:43:43 UTC (rev 140252) @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(mpfr.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +}