From 77e12b9a2a93b64b2b8ea02143708d36ace86499 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 3 Sep 2021 16:32:12 +0200 Subject: [PATCH 1/2] New package: cddlib-0.94m --- common/shlibs | 2 ++ srcpkgs/cddlib-devel | 1 + srcpkgs/cddlib/template | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 120000 srcpkgs/cddlib-devel create mode 100644 srcpkgs/cddlib/template diff --git a/common/shlibs b/common/shlibs index 52c2f17b7198..68d935a476a4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -47,6 +47,8 @@ libSegFault.so glibc-2.32_1 libpcprofile.so glibc-2.32_1 libcidn.so.1 glibc-2.32_1 libmvec.so.1 glibc-2.32_1 +libcddgmp.so.0 cddlib-0.94m_1 +libcdd.so.0 cddlib-0.94m_1 libz.so.1 zlib-1.2.3_1 libb2.so.1 libb2-0.98.1_1 libbz2.so.1 bzip2-1.0.5_1 diff --git a/srcpkgs/cddlib-devel b/srcpkgs/cddlib-devel new file mode 120000 index 000000000000..401ad0a0b1bc --- /dev/null +++ b/srcpkgs/cddlib-devel @@ -0,0 +1 @@ +cddlib \ No newline at end of file diff --git a/srcpkgs/cddlib/template b/srcpkgs/cddlib/template new file mode 100644 index 000000000000..39ccfae92ac6 --- /dev/null +++ b/srcpkgs/cddlib/template @@ -0,0 +1,23 @@ +# Template file for 'cddlib' +pkgname=cddlib +version=0.94m +revision=1 +build_style=gnu-configure +hostmakedepends="gmp-devel" +short_desc="Efficient implementation of the Double Description Method" +maintainer="dkwo " +license="GPL-2.0-or-later" +homepage="https://people.inf.ethz.ch/fukudak/cdd_home/" +distfiles="https://github.com/cddlib/cddlib/releases/download/${version}/cddlib-${version}.tar.gz" +checksum=70dffdb3369b8704dc75428a1b3c42ab9047b81ce039f12f427e2eb2b1b0dee2 + +cddlib-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} From a5803b78f9dbf2578dcb7222705a5f2ab8f73270 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 3 Sep 2021 17:41:02 +0200 Subject: [PATCH 2/2] New package: singular-4.2.1 --- .../patches/upstream_omalloc_new_musl.patch | 40 +++++++++++++++++++ .../patches/upstream_polys_test_musl.patch | 22 ++++++++++ srcpkgs/singular/template | 34 ++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 srcpkgs/singular/patches/upstream_omalloc_new_musl.patch create mode 100644 srcpkgs/singular/patches/upstream_polys_test_musl.patch create mode 100644 srcpkgs/singular/template diff --git a/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch b/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch new file mode 100644 index 000000000000..354603bb2c44 --- /dev/null +++ b/srcpkgs/singular/patches/upstream_omalloc_new_musl.patch @@ -0,0 +1,40 @@ +From e1643135645a3cc97af8659018defd2b8617bb4e Mon Sep 17 00:00:00 2001 +From: Hans Schoenemann +Date: Thu, 23 Sep 2021 10:57:25 +0200 +Subject: [PATCH] omalloc: fix alignment stuff for "make check" + +--- + omalloc/omtTest.c | 6 ------ + omalloc/omtTest.h | 2 +- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/omalloc/omtTest.c b/omalloc/omtTest.c +index 715fbb113c..75c8cdb210 100644 +--- a/omalloc/omtTest.c ++++ b/omalloc/omtTest.c +@@ -70,12 +70,6 @@ void omtTestDebug(omMemCell cell) + } + + is_size = omSizeOfAddr(cell->addr); +- if (!OM_IS_ALIGNED(is_size)) +- { +- omReportError(omError_Unknown, omError_NoError, OM_FLR, +- "is_size == %u is unaligned", is_size); +- return; +- } + if (is_size < size) + { + omReportError(omError_Unknown, omError_NoError, OM_FLR, +diff --git a/omalloc/omtTest.h b/omalloc/omtTest.h +index a579d88011..6faa099c89 100644 +--- a/omalloc/omtTest.h ++++ b/omalloc/omtTest.h +@@ -48,7 +48,7 @@ void TestFree(omMemCell cell); + + #define IS_STICKY_BIN(spec) (spec & 1) + // #define IS_STICKY_BIN(spec) (0) +-#define GET_SIZE(spec) (spec & ((((unsigned long) 1) << 14) -1)) ++#define GET_SIZE(spec) OM_ALIGN_SIZE((spec & ((((unsigned long) 1) << 14) -1))) + #define SET_SIZE(spec, size) spec = ((spec & ~((((unsigned long) 1) << 14) -1)) | (size)) + #define IS_ALIGNED(spec) (spec & (((unsigned long) 1) << 15)) + #define IS_ZERO(spec) (spec & (((unsigned long) 1) << 16)) diff --git a/srcpkgs/singular/patches/upstream_polys_test_musl.patch b/srcpkgs/singular/patches/upstream_polys_test_musl.patch new file mode 100644 index 000000000000..73ee062e2f89 --- /dev/null +++ b/srcpkgs/singular/patches/upstream_polys_test_musl.patch @@ -0,0 +1,22 @@ +From 6e2383111a18b2fa2d3421045625d1d424eb1e25 Mon Sep 17 00:00:00 2001 +From: Hans Schoenemann +Date: Mon, 20 Sep 2021 15:13:36 +0200 +Subject: [PATCH] fix: make check: polys_test + +--- + libpolys/tests/polys_test.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libpolys/tests/polys_test.h b/libpolys/tests/polys_test.h +index 5526aa5a6b..5b4c561238 100644 +--- a/libpolys/tests/polys_test.h ++++ b/libpolys/tests/polys_test.h +@@ -2481,7 +2481,7 @@ class PolysTestSuite : public CxxTest::TestSuite + { + for (int qi = 0; qi <= 100; qi++) + { +- int c = rand() % 1000000; ++ int c = rand() % 1000000+1; /* c must not be 0 */ + poly qterm = p_ISet(c, r); p_SetExp(qterm, 1, qi, r); + p_Setm(qterm, r); + number qtermAsN = toFractionNumber(qterm, cf); diff --git a/srcpkgs/singular/template b/srcpkgs/singular/template new file mode 100644 index 000000000000..9996a2db535a --- /dev/null +++ b/srcpkgs/singular/template @@ -0,0 +1,34 @@ +# Template file for 'singular' +pkgname=singular +version=4.2.1 +revision=1 +build_style=gnu-configure +configure_args="--with-readline=ncurses +# --prefix=/usr +# --libexecdir=/usr/lib + --enable-gfanlib + --enable-Singular + --enable-factory + --disable-doc + --disable-polymake + --without-python +# --without-pythonmodule +# --disable-python +# --disable-python_module +# --disable-python-module +# --disable-static + --with-libparse + ac_cv_lib_cddgmp_dd_free_global_constants=yes" +hostmakedepends="perl tar doxygen" +makedepends="flintlib-devel cddlib-devel readline-devel graphviz" +short_desc="Computer algebra system for polynomial computations" +maintainer="dkwo " +license="GPL-2.0-or-later" +homepage="https://www.singular.uni-kl.de" +distfiles="https://service.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/${version//./-}/singular-${version}.tar.gz" +checksum=28a56df84f85b116e0068ffecf92fbe08fc27bd4c5ba902997f1a367db0bfe8d +# nocross="fails to configure, bug upstream" + +if [ -z "$CROSS_BUILD" ]; then + makedepends+=" ntl-devel" +fi