From b778556cb8f6c3195eca5bf92f6f15b11303c31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 11 Sep 2023 20:11:20 -0300 Subject: [PATCH] flintlib: update to 3.0.1. --- common/shlibs | 3 +-- srcpkgs/arb | 1 + srcpkgs/arb-devel | 2 +- srcpkgs/arb/template | 24 ------------------- .../patches/fix-test-t-sdiv_qrnnd.patch | 23 ------------------ srcpkgs/flintlib/template | 21 ++++++++++++---- 6 files changed, 20 insertions(+), 54 deletions(-) create mode 120000 srcpkgs/arb delete mode 100644 srcpkgs/arb/template delete mode 100644 srcpkgs/flintlib/patches/fix-test-t-sdiv_qrnnd.patch diff --git a/common/shlibs b/common/shlibs index f7046cbb6c2..863776568fb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3972,8 +3972,7 @@ libgtkdatabox.so.1 gtkdatabox3-1.0.0_1 libxcvt.so.0 libxcvt-0.1.1_1 libgf2x.so.3 gf2x-1.3.0_1 libntl.so.44 ntl-11.5.1_1 -libflint.so.17 flintlib-2.9.0_1 -libarb.so.2 arb-2.20.0_1 +libflint.so.18 flintlib-3.0.0_1 libec.so.10 eclib-20220621_1 libsymmetrica.so.2 symmetrica-3.0.1_1 libLfunction.so.1 lcalc-2.0.4_1 diff --git a/srcpkgs/arb b/srcpkgs/arb new file mode 120000 index 00000000000..7c263318306 --- /dev/null +++ b/srcpkgs/arb @@ -0,0 +1 @@ +flintlib \ No newline at end of file diff --git a/srcpkgs/arb-devel b/srcpkgs/arb-devel index 456b9f00a86..7c263318306 120000 --- a/srcpkgs/arb-devel +++ b/srcpkgs/arb-devel @@ -1 +1 @@ -arb \ No newline at end of file +flintlib \ No newline at end of file diff --git a/srcpkgs/arb/template b/srcpkgs/arb/template deleted file mode 100644 index 84a62c7ffdb..00000000000 --- a/srcpkgs/arb/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'arb' -pkgname=arb -version=2.23.0 -revision=1 -build_style=configure -configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr --with-flint=/usr" -makedepends="flintlib-devel" -short_desc="C library for arbitrary-precision interval arithmetic" -maintainer="Gonzalo Tornaría " -license="LGPL-2.1-or-later" -homepage="https://arblib.org" -changelog="https://raw.githubusercontent.com/fredrik-johansson/arb/master/doc/source/history.rst" -distfiles="https://github.com/fredrik-johansson/arb/archive/${version}.tar.gz" -checksum=977d41bde46f5442511d5165c705cec32c03e852c84d7d1836135d412ce702bb - -arb-devel_package() { - depends="${sourcepkg}>=${version}_${revision} ${makedepends}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/flintlib/patches/fix-test-t-sdiv_qrnnd.patch b/srcpkgs/flintlib/patches/fix-test-t-sdiv_qrnnd.patch deleted file mode 100644 index cfa10979289..00000000000 --- a/srcpkgs/flintlib/patches/fix-test-t-sdiv_qrnnd.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fb8ddbcc06afa2a8f25637032fbb8211f6c6c122 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Albin=20Ahlb=C3=A4ck?= -Date: Fri, 20 May 2022 14:16:38 +0200 -Subject: [PATCH] Fix bug in test code for GCC 12 - ---- - test/t-sdiv_qrnnd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/t-sdiv_qrnnd.c b/test/t-sdiv_qrnnd.c -index 2e9822e848..2676903826 100644 ---- a/test/t-sdiv_qrnnd.c -+++ b/test/t-sdiv_qrnnd.c -@@ -33,7 +33,7 @@ int main(void) - { - d = n_randtest_not_zero(state); - nh = n_randtest(state); -- } while ((FLINT_ABS(nh) >= FLINT_ABS(d)/2) || (nh == WORD_MIN)); -+ } while ((nh == WORD_MIN) || (FLINT_ABS(nh) >= FLINT_ABS(d)/2)); - - nl = n_randtest(state); - - diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template index f7442c8052a..254d18c42f5 100644 --- a/srcpkgs/flintlib/template +++ b/srcpkgs/flintlib/template @@ -1,10 +1,10 @@ # Template file for 'flintlib' pkgname=flintlib -version=2.9.0 +version=3.0.1 revision=1 -build_style=configure +build_style=gnu-configure configure_args="--prefix=/usr $(vopt_with ntl) - $(vopt_if openblas --with-blas=${XBPS_CROSS_BASE}/usr/include/openblas)" + $(vopt_if openblas --with-blas-include=${XBPS_CROSS_BASE}/usr/include/openblas)" makedepends="mpfr-devel $(vopt_if ntl ntl-devel) $(vopt_if openblas openblas-devel)" short_desc="Fast Library for Number Theory" @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://flintlib.org" changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS" distfiles="https://flintlib.org/flint-${version}.tar.gz" -checksum=2fc090d51033c93208e6c10d406397a53c983ae5343b958eb25f72a57a4ce76a +checksum=7b311a00503a863881eb8177dbeb84322f29399f3d7d72f3b1a4c9ba1d5794b4 build_options="ntl openblas" desc_option_ntl="enable NTL support" @@ -33,7 +33,20 @@ flintlib-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" } } + +arb_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} + +arb-devel_package() { + depends="${sourcepkg}-devel>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +}