pari: bump to 2.7.6, add _data sub-package, improve dependencies. (#746)

This commit is contained in:
fbrosson
2016-07-31 01:19:52 +00:00
committed by waddlesplash
parent 52cc9536eb
commit 3b513e71c5
2 changed files with 24 additions and 35 deletions

View File

@@ -15,11 +15,11 @@ COPYRIGHT="2000-2016 The PARI Group, Bordeaux"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-$portVersion.tar.gz"
CHECKSUM_SHA256="2140fe2d40b5a42acd5b7fce7e49b576777efdfc59370b531e07cb07d4401431"
CHECKSUM_SHA256="39a797222e33b8498777d4bca7b0d64acebddecc9f478578ada87d769289b811"
PATCHES="pari-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
pari$secondaryArchSuffix = $portVersion compat >= 2
@@ -31,14 +31,10 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
pari_data == $portVersion
lib:libgmp$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
"
if [ -n "$secondaryArchSuffix" ]; then
REQUIRES="$REQUIRES
pari == $portVersion base
"
fi
PROVIDES_devel="
pari${secondaryArchSuffix}_devel = $portVersion compat >= 2
@@ -46,11 +42,17 @@ PROVIDES_devel="
"
REQUIRES_devel="
pari$secondaryArchSuffix == $portVersion base
devel:libgmp$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix
"
if [ -n "$secondaryArchSuffix" ]; then
REQUIRES_devel="$REQUIRES_devel
pari_devel == $portVersion
if [ -z "$secondaryArchSuffix" ]; then
SUMMARY="A specialized computer algebra system (data files)"
ARCHITECTURES_data="any"
PROVIDES_data="
pari_data = $portVersion
"
REQUIRES_data=""
fi
BUILD_REQUIRES="
@@ -60,6 +62,7 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:diff
cmd:ld$secondaryArchSuffix
cmd:make
cmd:sed
@@ -79,8 +82,17 @@ INSTALL()
rm $libDir/libpari.so
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $dataDir $documentationDir
else
packageEntries data $dataDir
fi
prepareInstalledDevelLib libpari-gmp
fixPkgconfig
packageEntries devel $developDir
}
TEST()
{
make dobench
# make test-all
}

View File

@@ -5,7 +5,7 @@ Subject: we only use release versions, no point in checking .git
diff --git a/config/version b/config/version
index 6583ea3..4ec323e 100644
index db70d45..8cf820a 100644
--- a/config/version
+++ b/config/version
@@ -19,15 +19,6 @@ patchlevel_verbose=
@@ -48,7 +48,7 @@ index 5da1bc8..515bcfd 100755
fi
echo $arch-$osname
diff --git a/config/get_dlld b/config/get_dlld
index 2272aac..10632d5 100644
index 4b41be0..17edd4b 100644
--- a/config/get_dlld
+++ b/config/get_dlld
@@ -9,7 +9,7 @@ DLSUFFIX=so
@@ -89,29 +89,6 @@ index 513a983..1e42fdd 100644
1.8.3.4
From a57c9817676e5723c03b47d467fa9efb9210bdac Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Thu, 14 Apr 2016 22:46:58 +0000
Subject: drop duplicate semicolon to fix gcc2 build
diff --git a/src/basemath/polarit2.c b/src/basemath/polarit2.c
index a923e4a..0f0d3c5 100644
--- a/src/basemath/polarit2.c
+++ b/src/basemath/polarit2.c
@@ -494,7 +494,7 @@ gauss_factor(GEN x)
exp &= 3;
}
if (j > 1) {
- long k = 1;;
+ long k = 1;
GEN P1 = cgetg(l, t_COL);
GEN E1 = cgetg(l, t_COL);
/* remove factors with exponent 0 */
--
2.7.0
From b3b6fe12d21426142d2d54c9fbf77dd8f88eebfe Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Thu, 14 Apr 2016 22:46:58 +0000