Skip to content

Commit 19f7de2

Browse files
d-torrancemahrud
authored andcommitted
Add patch for building factory w/ flint 3.3.0
Matrix internals have changed
1 parent 94171af commit 19f7de2

File tree

3 files changed

+28
-2
lines changed

3 files changed

+28
-2
lines changed

M2/cmake/build-libraries.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ ExternalProject_Add(build-factory
383383
SOURCE_DIR libraries/factory/build
384384
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/BUILD/tarfiles
385385
BUILD_IN_SOURCE ON
386-
# PATCH_COMMAND patch --batch < ${CMAKE_SOURCE_DIR}/libraries/factory/patch-4.4.0
386+
PATCH_COMMAND patch --batch -p1 < ${CMAKE_SOURCE_DIR}/libraries/factory/patch-4.4.1
387387
CONFIGURE_COMMAND autoreconf -vif &&
388388
${CONFIGURE} --prefix=${M2_HOST_PREFIX}
389389
#-C --cache-file=${CONFIGURE_CACHE}

M2/libraries/factory/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
URL = https://macaulay2.com/Downloads/OtherSourceCode
88
VERSION = 4.4.1
9-
#PATCHFILE = @abs_srcdir@/patch-$(VERSION)
9+
PATCHFILE = @abs_srcdir@/patch-$(VERSION)
1010
PRECONFIGURE = autoreconf -vif
1111

1212
BUILDTARGET = all ftmpl_inst.o

M2/libraries/factory/patch-4.4.1

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 37b65cbd2ccd13b713cfbaa9a95a6d1eda5f09d1 Mon Sep 17 00:00:00 2001
2+
From: Doug Torrance <[email protected]>
3+
Date: Wed, 11 Jun 2025 23:18:05 -0400
4+
Subject: [PATCH] Use fq_nmod_mat_entry instead of row pointer (removed in
5+
flint 3.3.0)
6+
7+
---
8+
factory/FLINTconvert.cc | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/factory/FLINTconvert.cc b/factory/FLINTconvert.cc
12+
index c36f6022d..a4d86fd17 100644
13+
--- a/FLINTconvert.cc
14+
+++ factory-4.4.1/FLINTconvert.cc
15+
@@ -652,7 +652,7 @@ convertFacCFMatrix2Fq_nmod_mat_t (fq_nmod_mat_t M,
16+
{
17+
for(j=m.columns();j>0;j--)
18+
{
19+
- convertFacCF2nmod_poly_t (M->rows[i-1]+j-1, m (i,j));
20+
+ convertFacCF2nmod_poly_t (fq_nmod_mat_entry(M, i-1, j-1), m (i,j));
21+
}
22+
}
23+
}
24+
--
25+
2.43.0
26+

0 commit comments

Comments
 (0)