* [PR PATCH] New package: gfan-0.6.2
@ 2021-11-21 12:32 tornaria
2021-11-21 13:49 ` [PR PATCH] [Updated] " tornaria
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 12:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages gfan
https://github.com/void-linux/void-packages/pull/34182
New package: gfan-0.6.2
Dependency of sagemath
A patch file from https://github.com/void-linux/void-packages/pull/34182.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gfan-34182.patch --]
[-- Type: text/x-diff, Size: 5883 bytes --]
From 407e6854a68711999711edd2737aabc913197dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 09:29:09 -0300
Subject: [PATCH] New package: gfan-0.6.2
---
.../gfan/patches/maketestsreturnerror.patch | 27 +++
.../gfan/patches/truncate0008outputs.patch | 195 ++++++++++++++++++
srcpkgs/gfan/template | 23 +++
srcpkgs/gfan/update | 1 +
4 files changed, 246 insertions(+)
create mode 100644 srcpkgs/gfan/patches/maketestsreturnerror.patch
create mode 100644 srcpkgs/gfan/patches/truncate0008outputs.patch
create mode 100644 srcpkgs/gfan/template
create mode 100644 srcpkgs/gfan/update
diff --git a/srcpkgs/gfan/patches/maketestsreturnerror.patch b/srcpkgs/gfan/patches/maketestsreturnerror.patch
new file mode 100644
index 000000000000..8197f08b74f1
--- /dev/null
+++ b/srcpkgs/gfan/patches/maketestsreturnerror.patch
@@ -0,0 +1,27 @@
+diff --git a/src/app_test.cpp b/src/app_test.cpp
+index 755bfe6..183c735 100644
+--- a/src/app_test.cpp
++++ b/src/app_test.cpp
+@@ -562,6 +562,9 @@ int testIntegers()
+ failed.push_back(i->folder);
+ }
+ cout<<"\n";
++ cout<<"Number of succesful tests "<<good<<endl;
++ cout<<"Number of failed tests "<<bad<<endl;
++
+ if(!failed.empty())
+ {
+ cout<<"Failed tests:\n-------------\n";
+@@ -569,11 +572,9 @@ int testIntegers()
+ {
+ cout<<*i<<" FAILED!\n";
+ }
++ return 1;
+ }
+
+- cout<<"Number of succesful tests "<<good<<endl;
+- cout<<"Number of failed tests "<<bad<<endl;
+-
+ return 0;
+ }
+ };
diff --git a/srcpkgs/gfan/patches/truncate0008outputs.patch b/srcpkgs/gfan/patches/truncate0008outputs.patch
new file mode 100644
index 000000000000..bcc12b340b51
--- /dev/null
+++ b/srcpkgs/gfan/patches/truncate0008outputs.patch
@@ -0,0 +1,195 @@
+diff --git a/testsuite/0008PolynomialSetUnion/command b/testsuite/0008PolynomialSetUnion/command
+index cbb23d6..d61cb71 100644
+--- a/testsuite/0008PolynomialSetUnion/command
++++ b/testsuite/0008PolynomialSetUnion/command
+@@ -1 +1 @@
+-%s _bases | %s _polynomialsetunion |sort
++%s _bases | %s _polynomialsetunion |LC_ALL=C sort|tail -n +2 | sed -e '$ d'
+diff --git a/testsuite/0008PolynomialSetUnion/output b/testsuite/0008PolynomialSetUnion/output
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/output
++++ b/testsuite/0008PolynomialSetUnion/output
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
+diff --git a/testsuite/0008PolynomialSetUnion/outputNew b/testsuite/0008PolynomialSetUnion/outputNew
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/outputNew
++++ b/testsuite/0008PolynomialSetUnion/outputNew
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
diff --git a/srcpkgs/gfan/template b/srcpkgs/gfan/template
new file mode 100644
index 000000000000..aa8a6eb28573
--- /dev/null
+++ b/srcpkgs/gfan/template
@@ -0,0 +1,23 @@
+# Template file for 'gfan'
+pkgname=gfan
+version=0.6.2
+revision=1
+wrksrc=gfan$version
+build_style=gnu-makefile
+makedepends="gmp-devel cddlib-devel"
+short_desc="Package for computing Groebner fans and tropical varieties"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://math.au.dk/~jensen/software/gfan/gfan.html"
+distfiles="https://math.au.dk/~jensen/software/gfan/gfan${version}.tar.gz"
+checksum=a674d5e5dc43634397de0d55dd5da3c32bd358d05f72b73a50e62c1a1686f10a
+
+# - without -DGMPRATIONAL the build fails
+# the Makefile sets this flag but our CFLAGS override it
+# - the include prefix for cddlib has changed in recent versions so we
+# disable the old prefix and use -I for the new prefix
+CFLAGS="-DGMPRATIONAL -DNOCDDPREFIX -I/usr/include/cddlib"
+
+do_install() {
+ make PREFIX=${DESTDIR}/usr install
+}
diff --git a/srcpkgs/gfan/update b/srcpkgs/gfan/update
new file mode 100644
index 000000000000..d7ac612f989d
--- /dev/null
+++ b/srcpkgs/gfan/update
@@ -0,0 +1 @@
+ignore=lib*
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
@ 2021-11-21 13:49 ` tornaria
2021-11-21 15:29 ` tornaria
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 13:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages gfan
https://github.com/void-linux/void-packages/pull/34182
New package: gfan-0.6.2
Dependency of sagemath
A patch file from https://github.com/void-linux/void-packages/pull/34182.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gfan-34182.patch --]
[-- Type: text/x-diff, Size: 9819 bytes --]
From af1ac48dd4ef7db44b449dc9ff8abc825b410cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 09:29:09 -0300
Subject: [PATCH] New package: gfan-0.6.2
Uses three patches taken from sagemath, cf
https://git.sagemath.org/sage.git/plain/build/pkgs/gfan/patches?h=9.5.beta7
- fix location of cddlib include files
- normalize the output of one failing test
- make tests return an error so build aborts
---
.../gfan/patches/maketestsreturnerror.patch | 27 +++
| 71 +++++++
.../gfan/patches/truncate0008outputs.patch | 195 ++++++++++++++++++
srcpkgs/gfan/template | 32 +++
srcpkgs/gfan/update | 1 +
5 files changed, 326 insertions(+)
create mode 100644 srcpkgs/gfan/patches/maketestsreturnerror.patch
create mode 100644 srcpkgs/gfan/patches/new-cddlib-header-location.patch
create mode 100644 srcpkgs/gfan/patches/truncate0008outputs.patch
create mode 100644 srcpkgs/gfan/template
create mode 100644 srcpkgs/gfan/update
diff --git a/srcpkgs/gfan/patches/maketestsreturnerror.patch b/srcpkgs/gfan/patches/maketestsreturnerror.patch
new file mode 100644
index 000000000000..8197f08b74f1
--- /dev/null
+++ b/srcpkgs/gfan/patches/maketestsreturnerror.patch
@@ -0,0 +1,27 @@
+diff --git a/src/app_test.cpp b/src/app_test.cpp
+index 755bfe6..183c735 100644
+--- a/src/app_test.cpp
++++ b/src/app_test.cpp
+@@ -562,6 +562,9 @@ int testIntegers()
+ failed.push_back(i->folder);
+ }
+ cout<<"\n";
++ cout<<"Number of succesful tests "<<good<<endl;
++ cout<<"Number of failed tests "<<bad<<endl;
++
+ if(!failed.empty())
+ {
+ cout<<"Failed tests:\n-------------\n";
+@@ -569,11 +572,9 @@ int testIntegers()
+ {
+ cout<<*i<<" FAILED!\n";
+ }
++ return 1;
+ }
+
+- cout<<"Number of succesful tests "<<good<<endl;
+- cout<<"Number of failed tests "<<bad<<endl;
+-
+ return 0;
+ }
+ };
--git a/srcpkgs/gfan/patches/new-cddlib-header-location.patch b/srcpkgs/gfan/patches/new-cddlib-header-location.patch
new file mode 100644
index 000000000000..e67c35ad452f
--- /dev/null
+++ b/srcpkgs/gfan/patches/new-cddlib-header-location.patch
@@ -0,0 +1,71 @@
+diff --git a/doc/installation.tex b/doc/installation.tex
+index 763f147..61c87be 100644
+--- a/doc/installation.tex
++++ b/doc/installation.tex
+@@ -20,7 +20,7 @@ Should this command fail, then you are using an old version of gfan.
+ As an alternative to using package managers as above you can try to locate an executable file named ``gfan'' in the installation of other math software. SageMath, for example, contains a gfan executable. You also have the possibility of installing a precompiled executables: go to the Gfan webpage, go to the binaries.html subpage, and follow the instructions there. There is however only very few executables available.
+
+ %% Rewrite this section.
+-%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cdd/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
++%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cddlib/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
+
+ %% The same thing goes for gmp???? EXCEPT THAT FOR SOME REASON gmp is allowed to be in /usr/include .
+
+diff --git a/src/app_librarytest.cpp b/src/app_librarytest.cpp
+index 3b1395b..d91a264 100644
+--- a/src/app_librarytest.cpp
++++ b/src/app_librarytest.cpp
+@@ -12,8 +12,8 @@
+ #include "setoper.h"
+ #include "cdd.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+ #endif
+ #include <iostream>
+ #include <fstream>
+diff --git a/src/gfanlib_zcone.cpp b/src/gfanlib_zcone.cpp
+index f24f09c..481f116 100644
+--- a/src/gfanlib_zcone.cpp
++++ b/src/gfanlib_zcone.cpp
+@@ -16,8 +16,8 @@
+ #include "setoper.h"
+ #include "cdd.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+ #endif
+ //}
+
+@@ -52,8 +52,8 @@ namespace gfan{
+ "dd_free_global_constants()\n"
+ "in your deinitialisation code (only available for cddlib version>=094d).\n"
+ "This requires the header includes:\n"
+- "#include \"cdd/setoper.h\"\n"
+- "#include \"cdd/cdd.h\"\n"
++ "#include \"cddlib/setoper.h\"\n"
++ "#include \"cddlib/cdd.h\"\n"
+ "\n"
+ "Alternatively, you may call gfan:initializeCddlibIfRequired() and deinitializeCddlibIfRequired()\n"
+ "if gfanlib is the only code using cddlib. If at some point cddlib is no longer required by gfanlib\n"
+diff --git a/src/lp_cdd.cpp b/src/lp_cdd.cpp
+index ec36517..5232d50 100644
+--- a/src/lp_cdd.cpp
++++ b/src/lp_cdd.cpp
+@@ -5,9 +5,9 @@
+ #include "cdd.h"
+ #include "cdd_f.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
+-#include "cdd/cdd_f.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
++#include "cddlib/cdd_f.h"
+ #endif
+ //}
+ #include "termorder.h"
diff --git a/srcpkgs/gfan/patches/truncate0008outputs.patch b/srcpkgs/gfan/patches/truncate0008outputs.patch
new file mode 100644
index 000000000000..bcc12b340b51
--- /dev/null
+++ b/srcpkgs/gfan/patches/truncate0008outputs.patch
@@ -0,0 +1,195 @@
+diff --git a/testsuite/0008PolynomialSetUnion/command b/testsuite/0008PolynomialSetUnion/command
+index cbb23d6..d61cb71 100644
+--- a/testsuite/0008PolynomialSetUnion/command
++++ b/testsuite/0008PolynomialSetUnion/command
+@@ -1 +1 @@
+-%s _bases | %s _polynomialsetunion |sort
++%s _bases | %s _polynomialsetunion |LC_ALL=C sort|tail -n +2 | sed -e '$ d'
+diff --git a/testsuite/0008PolynomialSetUnion/output b/testsuite/0008PolynomialSetUnion/output
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/output
++++ b/testsuite/0008PolynomialSetUnion/output
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
+diff --git a/testsuite/0008PolynomialSetUnion/outputNew b/testsuite/0008PolynomialSetUnion/outputNew
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/outputNew
++++ b/testsuite/0008PolynomialSetUnion/outputNew
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
diff --git a/srcpkgs/gfan/template b/srcpkgs/gfan/template
new file mode 100644
index 000000000000..5b382d99463c
--- /dev/null
+++ b/srcpkgs/gfan/template
@@ -0,0 +1,32 @@
+# Template file for 'gfan'
+pkgname=gfan
+version=0.6.2
+revision=1
+wrksrc=gfan$version
+build_style=gnu-makefile
+makedepends="gmp-devel cddlib-devel"
+short_desc="Package for computing Groebner fans and tropical varieties"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://math.au.dk/~jensen/software/gfan/gfan.html"
+distfiles="https://math.au.dk/~jensen/software/gfan/gfan${version}.tar.gz"
+checksum=a674d5e5dc43634397de0d55dd5da3c32bd358d05f72b73a50e62c1a1686f10a
+
+# Makefile has this but our CFLAGS override it; build fails otherwise
+CFLAGS="-DGMPRATIONAL"
+
+if [ -n "$CROSS_BUILD" ]; then
+ # depend on host gfan for installlinks
+ hostmakedepends+=" gfan"
+fi
+
+do_install() {
+ if [ -z "$CROSS_BUILD" ]; then
+ # Makefile doesn't support DESTDIR so we add it to PREFIX
+ make PREFIX=${DESTDIR}/usr install
+ else
+ vbin gfan
+ # use host gfan to install links
+ cd ${DESTDIR}/usr/bin && gfan installlinks
+ fi
+}
diff --git a/srcpkgs/gfan/update b/srcpkgs/gfan/update
new file mode 100644
index 000000000000..d7ac612f989d
--- /dev/null
+++ b/srcpkgs/gfan/update
@@ -0,0 +1 @@
+ignore=lib*
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
2021-11-21 13:49 ` [PR PATCH] [Updated] " tornaria
@ 2021-11-21 15:29 ` tornaria
2021-11-21 15:39 ` tornaria
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 15:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974838027
Comment:
It seems to be stuck in a test on i686. On my box the test that stalls is:
```
Running command:"cat <testsuite/0602ResultantFanProjection/input|./gfan _resultantfan --vectorinput --projection| grep F_VECTOR -A1>testsuite/0602ResultantFanProjection/outputNew"
```
The whole testsuite takes ~ 1m on x86_64 and the test above has been running for 6m+ on my box (and apparently it ran 1h30 on CI).
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
2021-11-21 13:49 ` [PR PATCH] [Updated] " tornaria
2021-11-21 15:29 ` tornaria
@ 2021-11-21 15:39 ` tornaria
2021-11-21 15:47 ` leahneukirchen
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 15:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974839950
Comment:
Summary: two tests fail on i686:
```
testsuite/0009RenderStairCase FAILED!
testsuite/0602ResultantFanProjection FAILED!
```
The first one finishes with failure, and the second one doesn't finish. I'll report them both upstream later.
@leahneukirchen: Do you think we have to delay merging b/c of this? I'll follow up in any case.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (2 preceding siblings ...)
2021-11-21 15:39 ` tornaria
@ 2021-11-21 15:47 ` leahneukirchen
2021-11-21 16:11 ` tornaria
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: leahneukirchen @ 2021-11-21 15:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974841603
Comment:
I don't mind the test suite failure, but this sounds like it's actually broken on i686 so fixing would be good.
Perhaps someone can try on 32-bit ARM?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (3 preceding siblings ...)
2021-11-21 15:47 ` leahneukirchen
@ 2021-11-21 16:11 ` tornaria
2021-11-21 17:22 ` ericonr
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 16:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974846361
Comment:
> I don't mind the test suite failure, but this sounds like it's actually broken on i686 so fixing would be good.
Sure, but since only one particular application is broken maybe this is still useful. Otherwise we could not package for 32 bits.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (4 preceding siblings ...)
2021-11-21 16:11 ` tornaria
@ 2021-11-21 17:22 ` ericonr
2021-11-21 20:14 ` tornaria
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-11-21 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974859068
Comment:
Suggested on IRC: have you tried adding `-ffloat-store` to the x86 build to see if it's enough?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (5 preceding siblings ...)
2021-11-21 17:22 ` ericonr
@ 2021-11-21 20:14 ` tornaria
2021-11-21 20:20 ` tornaria
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 20:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974888017
Comment:
> Suggested on IRC: have you tried adding `-ffloat-store` to the x86 build to see if it's enough?
Indeed, this fixes the failure in `0009RenderStairCase` so I'll add it. Unfortunately, `0602ResultantFanProjection` is still looping forever regardless of this option.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (6 preceding siblings ...)
2021-11-21 20:14 ` tornaria
@ 2021-11-21 20:20 ` tornaria
2021-11-21 20:23 ` tornaria
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974889214
Comment:
I couldn't find an issue tracker for gfan. On the sagemath trac, the same issue was reported 5 months ago in https://trac.sagemath.org/ticket/32088, but there is no clue there.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (7 preceding siblings ...)
2021-11-21 20:20 ` tornaria
@ 2021-11-21 20:23 ` tornaria
2021-11-21 21:52 ` [PR PATCH] [Updated] " tornaria
2021-11-22 12:18 ` [PR PATCH] [Merged]: " leahneukirchen
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 20:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/34182#issuecomment-974889734
Comment:
Also debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905300. They just disable this test on 32bit.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (8 preceding siblings ...)
2021-11-21 20:23 ` tornaria
@ 2021-11-21 21:52 ` tornaria
2021-11-22 12:18 ` [PR PATCH] [Merged]: " leahneukirchen
10 siblings, 0 replies; 12+ messages in thread
From: tornaria @ 2021-11-21 21:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages gfan
https://github.com/void-linux/void-packages/pull/34182
New package: gfan-0.6.2
Dependency of sagemath
A patch file from https://github.com/void-linux/void-packages/pull/34182.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gfan-34182.patch --]
[-- Type: text/x-diff, Size: 11085 bytes --]
From 2c5be10e5ede5ff7210c5c7d12fc0ec5bdf04223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 21 Nov 2021 09:29:09 -0300
Subject: [PATCH] New package: gfan-0.6.2
Uses three patches taken from sagemath, cf
https://git.sagemath.org/sage.git/plain/build/pkgs/gfan/patches?h=9.5.beta7
- fix location of cddlib include files
- normalize the output of one failing test
- make tests return an error so build aborts
Also fixes for 32 bit bugs catched by testsuite:
- add `-ffloat-store` to CFLAGS to fix `0009RenderStairCase`
- patch typedef for `int64` which causes hang in `0602ResultantFanProjection`
---
.../patches/fix-int64-for-32bit-archs.patch | 18 ++
.../gfan/patches/maketestsreturnerror.patch | 27 +++
| 71 +++++++
.../gfan/patches/truncate0008outputs.patch | 195 ++++++++++++++++++
srcpkgs/gfan/template | 38 ++++
srcpkgs/gfan/update | 1 +
6 files changed, 350 insertions(+)
create mode 100644 srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch
create mode 100644 srcpkgs/gfan/patches/maketestsreturnerror.patch
create mode 100644 srcpkgs/gfan/patches/new-cddlib-header-location.patch
create mode 100644 srcpkgs/gfan/patches/truncate0008outputs.patch
create mode 100644 srcpkgs/gfan/template
create mode 100644 srcpkgs/gfan/update
diff --git a/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch b/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch
new file mode 100644
index 000000000000..c642e32c224e
--- /dev/null
+++ b/srcpkgs/gfan/patches/fix-int64-for-32bit-archs.patch
@@ -0,0 +1,18 @@
+patch typedef for `int64` which causes hang in `0602ResultantFanProjection`
+
+cf:
+https://github.com/void-linux/void-packages/pull/34182
+https://trac.sagemath.org/ticket/32088
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905300
+
+--- a/src/vektor.h 2017-06-20 11:47:37.000000000 -0300
++++ b/src/vektor.h 2021-11-21 18:28:43.384750825 -0300
+@@ -10,7 +10,7 @@
+
+ using namespace std;
+
+-typedef signed long int int64;
++typedef int64_t int64;
+
+ void outOfRange(int i, int n);
+
diff --git a/srcpkgs/gfan/patches/maketestsreturnerror.patch b/srcpkgs/gfan/patches/maketestsreturnerror.patch
new file mode 100644
index 000000000000..8197f08b74f1
--- /dev/null
+++ b/srcpkgs/gfan/patches/maketestsreturnerror.patch
@@ -0,0 +1,27 @@
+diff --git a/src/app_test.cpp b/src/app_test.cpp
+index 755bfe6..183c735 100644
+--- a/src/app_test.cpp
++++ b/src/app_test.cpp
+@@ -562,6 +562,9 @@ int testIntegers()
+ failed.push_back(i->folder);
+ }
+ cout<<"\n";
++ cout<<"Number of succesful tests "<<good<<endl;
++ cout<<"Number of failed tests "<<bad<<endl;
++
+ if(!failed.empty())
+ {
+ cout<<"Failed tests:\n-------------\n";
+@@ -569,11 +572,9 @@ int testIntegers()
+ {
+ cout<<*i<<" FAILED!\n";
+ }
++ return 1;
+ }
+
+- cout<<"Number of succesful tests "<<good<<endl;
+- cout<<"Number of failed tests "<<bad<<endl;
+-
+ return 0;
+ }
+ };
--git a/srcpkgs/gfan/patches/new-cddlib-header-location.patch b/srcpkgs/gfan/patches/new-cddlib-header-location.patch
new file mode 100644
index 000000000000..e67c35ad452f
--- /dev/null
+++ b/srcpkgs/gfan/patches/new-cddlib-header-location.patch
@@ -0,0 +1,71 @@
+diff --git a/doc/installation.tex b/doc/installation.tex
+index 763f147..61c87be 100644
+--- a/doc/installation.tex
++++ b/doc/installation.tex
+@@ -20,7 +20,7 @@ Should this command fail, then you are using an old version of gfan.
+ As an alternative to using package managers as above you can try to locate an executable file named ``gfan'' in the installation of other math software. SageMath, for example, contains a gfan executable. You also have the possibility of installing a precompiled executables: go to the Gfan webpage, go to the binaries.html subpage, and follow the instructions there. There is however only very few executables available.
+
+ %% Rewrite this section.
+-%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cdd/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
++%% The apt-get linux trouble disappears if all includes of cdd files are of form ``cddlib/set\_oper.h''. Now of course if we cannot run apt-get because we are not root we need to install cddlib manually. Here we should use configure to specify how that is done correctly. We should use --prefix=, --includedir=, and possibly --libdir=.
+
+ %% The same thing goes for gmp???? EXCEPT THAT FOR SOME REASON gmp is allowed to be in /usr/include .
+
+diff --git a/src/app_librarytest.cpp b/src/app_librarytest.cpp
+index 3b1395b..d91a264 100644
+--- a/src/app_librarytest.cpp
++++ b/src/app_librarytest.cpp
+@@ -12,8 +12,8 @@
+ #include "setoper.h"
+ #include "cdd.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+ #endif
+ #include <iostream>
+ #include <fstream>
+diff --git a/src/gfanlib_zcone.cpp b/src/gfanlib_zcone.cpp
+index f24f09c..481f116 100644
+--- a/src/gfanlib_zcone.cpp
++++ b/src/gfanlib_zcone.cpp
+@@ -16,8 +16,8 @@
+ #include "setoper.h"
+ #include "cdd.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
+ #endif
+ //}
+
+@@ -52,8 +52,8 @@ namespace gfan{
+ "dd_free_global_constants()\n"
+ "in your deinitialisation code (only available for cddlib version>=094d).\n"
+ "This requires the header includes:\n"
+- "#include \"cdd/setoper.h\"\n"
+- "#include \"cdd/cdd.h\"\n"
++ "#include \"cddlib/setoper.h\"\n"
++ "#include \"cddlib/cdd.h\"\n"
+ "\n"
+ "Alternatively, you may call gfan:initializeCddlibIfRequired() and deinitializeCddlibIfRequired()\n"
+ "if gfanlib is the only code using cddlib. If at some point cddlib is no longer required by gfanlib\n"
+diff --git a/src/lp_cdd.cpp b/src/lp_cdd.cpp
+index ec36517..5232d50 100644
+--- a/src/lp_cdd.cpp
++++ b/src/lp_cdd.cpp
+@@ -5,9 +5,9 @@
+ #include "cdd.h"
+ #include "cdd_f.h"
+ #else
+-#include "cdd/setoper.h"
+-#include "cdd/cdd.h"
+-#include "cdd/cdd_f.h"
++#include "cddlib/setoper.h"
++#include "cddlib/cdd.h"
++#include "cddlib/cdd_f.h"
+ #endif
+ //}
+ #include "termorder.h"
diff --git a/srcpkgs/gfan/patches/truncate0008outputs.patch b/srcpkgs/gfan/patches/truncate0008outputs.patch
new file mode 100644
index 000000000000..bcc12b340b51
--- /dev/null
+++ b/srcpkgs/gfan/patches/truncate0008outputs.patch
@@ -0,0 +1,195 @@
+diff --git a/testsuite/0008PolynomialSetUnion/command b/testsuite/0008PolynomialSetUnion/command
+index cbb23d6..d61cb71 100644
+--- a/testsuite/0008PolynomialSetUnion/command
++++ b/testsuite/0008PolynomialSetUnion/command
+@@ -1 +1 @@
+-%s _bases | %s _polynomialsetunion |sort
++%s _bases | %s _polynomialsetunion |LC_ALL=C sort|tail -n +2 | sed -e '$ d'
+diff --git a/testsuite/0008PolynomialSetUnion/output b/testsuite/0008PolynomialSetUnion/output
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/output
++++ b/testsuite/0008PolynomialSetUnion/output
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
+diff --git a/testsuite/0008PolynomialSetUnion/outputNew b/testsuite/0008PolynomialSetUnion/outputNew
+index 38dfb6f..12a65c7 100644
+--- a/testsuite/0008PolynomialSetUnion/outputNew
++++ b/testsuite/0008PolynomialSetUnion/outputNew
+@@ -1,62 +1,60 @@
+-{
++a*b-c^6,
++a*b^2-c^3,
++a*b^4-b,
++a*c-b^6,
++a*c^2-b,
++a*c^6-c,
++a-b^11,
++a-b^2*c,
++a-c^9,
+ a^11-c,
+ a^15-a,
++a^2*b-c,
+ a^2*b^3-a,
++a^2*c-b^3,
+ a^2-b^8,
+-a^2*b-c,
+ a^2-c^4,
+-a^2*c-b^3,
+-a^3-b^5,
+-a^3-b*c^2,
+ a^3*c^2-c}
+-a^4-b^2,
++a^3-b*c^2,
++a^3-b^5,
+ a^4*c-a,
++a^4-b^2,
+ a^5-c^3,
+ a^6*b-a,
+ a^6-b*c,
+ a^8-c^2,
+ a^9-b,
+-a-b^11,
+-a-b^2*c,
+-a*b^2-c^3,
+-a*b^4-b,
+-a*b-c^6,
+-a*c^2-b,
+-a*c^6-c,
+-a-c^9,
+-a*c-b^6,
++b*c-a^6,
++b*c^2-a^3,
++b*c^4-c,
++b-a*c^2,
++b-a^9,
++b-c^11,
+ b^11-a,
+ b^15-b,
+-b^2-a^4,
++b^2*c-a,
+ b^2*c^3-b,
++b^2-a^4,
+ b^2-c^8,
+-b^2*c-a,
+ b^3-a^2*c,
+ b^3-c^5,
+ b^4-c^2,
+ b^5-a^3,
+-b^6-a*c,
+ b^6*c-b,
++b^6-a*c,
+ b^8-a^2,
+ b^9-c,
+-b-a^9,
+-b-a*c^2,
+-b-c^11,
+-b*c^2-a^3,
+-b*c^4-c,
+-b*c-a^6,
++c-a^11,
++c-a^2*b,
++c-b^9,
+ c^11-b,
+ c^15-c,
+ c^2-a^8,
+ c^2-b^4,
+-c^3-a^5,
+ c^3-a*b^2,
++c^3-a^5,
+ c^4-a^2,
+ c^5-b^3,
+ c^6-a*b,
+ c^8-b^2,
+ c^9-a,
+-c-a^11,
+-c-a^2*b,
+-c-b^9,
+-Q[a,b,c]
diff --git a/srcpkgs/gfan/template b/srcpkgs/gfan/template
new file mode 100644
index 000000000000..174ed182f9d3
--- /dev/null
+++ b/srcpkgs/gfan/template
@@ -0,0 +1,38 @@
+# Template file for 'gfan'
+pkgname=gfan
+version=0.6.2
+revision=1
+wrksrc=gfan$version
+build_style=gnu-makefile
+makedepends="gmp-devel cddlib-devel"
+short_desc="Package for computing Groebner fans and tropical varieties"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="https://math.au.dk/~jensen/software/gfan/gfan.html"
+distfiles="https://math.au.dk/~jensen/software/gfan/gfan${version}.tar.gz"
+checksum=a674d5e5dc43634397de0d55dd5da3c32bd358d05f72b73a50e62c1a1686f10a
+
+# Makefile has this but our CFLAGS override it; build fails otherwise
+CFLAGS="-DGMPRATIONAL"
+
+case $XBPS_TARGET_MACHINE in
+ # avoid numerical noise caused by extended-precision of registers
+ # fixes testsuite/0009RenderStairCase
+ i686*) CFLAGS+=" -ffloat-store" ;;
+esac
+
+if [ -n "$CROSS_BUILD" ]; then
+ # depend on host gfan for installlinks
+ hostmakedepends+=" gfan"
+fi
+
+do_install() {
+ if [ -z "$CROSS_BUILD" ]; then
+ # Makefile doesn't support DESTDIR so we add it to PREFIX
+ make PREFIX=${DESTDIR}/usr install
+ else
+ vbin gfan
+ # use host gfan to install links
+ cd ${DESTDIR}/usr/bin && gfan installlinks
+ fi
+}
diff --git a/srcpkgs/gfan/update b/srcpkgs/gfan/update
new file mode 100644
index 000000000000..d7ac612f989d
--- /dev/null
+++ b/srcpkgs/gfan/update
@@ -0,0 +1 @@
+ignore=lib*
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Merged]: New package: gfan-0.6.2
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
` (9 preceding siblings ...)
2021-11-21 21:52 ` [PR PATCH] [Updated] " tornaria
@ 2021-11-22 12:18 ` leahneukirchen
10 siblings, 0 replies; 12+ messages in thread
From: leahneukirchen @ 2021-11-22 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
There's a merged pull request on the void-packages repository
New package: gfan-0.6.2
https://github.com/void-linux/void-packages/pull/34182
Description:
Dependency of sagemath
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-11-22 12:18 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-21 12:32 [PR PATCH] New package: gfan-0.6.2 tornaria
2021-11-21 13:49 ` [PR PATCH] [Updated] " tornaria
2021-11-21 15:29 ` tornaria
2021-11-21 15:39 ` tornaria
2021-11-21 15:47 ` leahneukirchen
2021-11-21 16:11 ` tornaria
2021-11-21 17:22 ` ericonr
2021-11-21 20:14 ` tornaria
2021-11-21 20:20 ` tornaria
2021-11-21 20:23 ` tornaria
2021-11-21 21:52 ` [PR PATCH] [Updated] " tornaria
2021-11-22 12:18 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).