public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/normaliz] f44: Rebuild for gfan 0.8beta
Date: Sat, 20 Jun 2026 16:29:22 GMT [thread overview]
Message-ID: <178197296228.1.6213862349376013901.rpms-normaliz-aa1fe633bec2@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/normaliz
Branch : f44
Commit : aa1fe633bec287c27a963a52ce601660583ac01e
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-06-20T10:29:10-06:00
Stats : +81/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/normaliz/c/aa1fe633bec287c27a963a52ce601660583ac01e?branch=f44
Log:
Rebuild for gfan 0.8beta
- Fix Macaulay2 FTBFS by limiting cocoalib includes
---
diff --git a/normaliz-cocoalib.patch b/normaliz-cocoalib.patch
new file mode 100644
index 0000000..6a51d36
--- /dev/null
+++ b/normaliz-cocoalib.patch
@@ -0,0 +1,78 @@
+Fixes this Macaulay2 build failure:
+
+In file included from /usr/include/gsl/gsl_blas_types.h:28,
+ from /usr/include/gsl/gsl_matrix_complex_long_double.h:29,
+ from /usr/include/gsl/gsl_matrix.h:4,
+ from /usr/include/gsl/gsl_blas.h:27,
+ from /usr/include/CoCoA/ExternalLibs-GSL.H:29,
+ from /usr/include/CoCoA/library.H:29,
+ from /usr/include/libnormaliz/nmz_polynomial.h:39,
+ from /usr/include/libnormaliz/cone.h:40,
+ from ../../../../Macaulay2/e/interface/cone.cpp:23:
+/usr/include/gsl/gsl_cblas.h:46:6: error: multiple definition of ‘enum CBLAS_ORDER’
+ 46 | enum CBLAS_ORDER {CblasRowMajor=101, CblasColMajor=102};
+ | ^~~~~~~~~~~
+In file included from /usr/include/fflas-ffpack/fflas/fflas.h:38,
+ from /usr/include/fflas-ffpack/ffpack/ffpack.h:45,
+ from ../../../../Macaulay2/e/basic-rings/aring-ZZp-ffpack.hpp:21,
+ from ../../../../Macaulay2/e/basic-mutable-matrices/mat-linalg.hpp:24,
+ from ../../../../Macaulay2/e/mutable-matrices/mutablemat-defs.hpp:88,
+ from ../../../../Macaulay2/e/mutable-matrices/mutablemat.hpp:6,
+ from ../../../../Macaulay2/e/interface/cone.cpp:16:
+/usr/include/fflas-ffpack/config-blas.h:72:6: note: previous definition here
+ 72 | enum CBLAS_ORDER {CblasRowMajor=101, CblasColMajor=102 };
+ | ^~~~~~~~~~~
+
+--- source/libnormaliz/nmz_integral.cpp.orig 2026-02-02 03:27:57.000000000 -0700
++++ source/libnormaliz/nmz_integral.cpp 2026-06-12 11:05:54.399160887 -0600
+@@ -34,6 +34,10 @@
+ #include "libnormaliz/dynamic_bitset.h"
+ #include "libnormaliz/list_and_map_operations.h"
+
++#include "CoCoA/GlobalManager.H"
++#include "CoCoA/NumTheory-gcd.H"
++#include "CoCoA/RingZZ.H"
++
+ using namespace CoCoA;
+
+ #include "../libnormaliz/my_omp.h"
+--- source/libnormaliz/nmz_integrate.h.orig 2026-02-02 03:27:57.000000000 -0700
++++ source/libnormaliz/nmz_integrate.h 2026-06-12 10:48:44.418615330 -0600
+@@ -24,7 +24,13 @@
+ #define LIBNORMALIZ_NMZ_INTEGRATE_H
+
+ #ifdef NMZ_COCOA
+-#include "CoCoA/library.H"
++#include <deque>
++#include "CoCoA/factor.H"
++#include "CoCoA/BigRatOps.H"
++#include "CoCoA/RingDistrMPolyInlPP.H"
++#include "CoCoA/RingQQ.H"
++#include "CoCoA/SparsePolyIter.H"
++#include "CoCoA/SparsePolyOps-RingElem.H"
+ #endif
+
+ #include <fstream>
+--- source/libnormaliz/nmz_polynomial.cpp.orig 2026-02-02 03:27:57.000000000 -0700
++++ source/libnormaliz/nmz_polynomial.cpp 2026-06-12 11:09:44.116676782 -0600
+@@ -28,6 +28,9 @@
+
+ #ifdef NMZ_COCOA
+ #include "libnormaliz/nmz_integrate.h"
++#include "CoCoA/GlobalManager.H"
++#include "CoCoA/RingQQ.H"
++#include "CoCoA/RingZZ.H"
+ #endif
+
+ #include "libnormaliz/nmz_polynomial.h"
+--- source/libnormaliz/nmz_polynomial.h.orig 2026-02-02 03:27:57.000000000 -0700
++++ source/libnormaliz/nmz_polynomial.h 2026-06-12 10:04:03.440535053 -0600
+@@ -36,7 +36,7 @@
+ #include "libnormaliz/matrix.h"
+
+ #ifdef NMZ_COCOA
+-#include "CoCoA/library.H"
++#include "CoCoA/SparsePolyRing.H"
+ #endif
+
+ namespace libnormaliz {
diff --git a/normaliz.spec b/normaliz.spec
index 57f5f5a..8064276 100644
--- a/normaliz.spec
+++ b/normaliz.spec
@@ -21,6 +21,9 @@ VCS: git:%{giturl}.git
Source: %{giturl}/archive/v%{version}/%{name}-%{version}.tar.gz
# Use libcrypto from openssl instead of the (unpackaged) hash-library
Patch: %{name}-hash-library.patch
+# Fix a Macaulay2 build error by not including all of the CoCoA headers
+# https://github.com/Normaliz/Normaliz/pull/453
+Patch: %{name}-cocoalib.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
reply other threads:[~2026-06-20 16:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178197296228.1.6213862349376013901.rpms-normaliz-aa1fe633bec2@fedoraproject.org \
--to=loganjerry@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox