Skip to content

Commit 7202dcd

Browse files
author
Release Manager
committed
sagemathgh-41279: build givaro, fflas-ffpack and linbox without native arch in SAGE_FAT_BINARY
<!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> Fix sagemath#41000 Fix sagemath#39460 Fix sagemath#41273 Fix sagemath#41066 Test in sagemath#41277 It fixes the docker build and docker runner have different arch. Refer to passagemath/passagemath#1820 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#41279 Reported by: Chenxin Zhong Reviewer(s): Dima Pasechnik
2 parents 89e60a8 + 19dfaa7 commit 7202dcd

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

build/pkgs/configure/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=2576f9385c02f84221f7aaacdf0f7f559e84d613
3-
sha256=fe301e2c7401169b0262bfa33dfd43b4ad0cccbf744504d5ad732e33339e2ead
2+
sha1=06e412438b505584a6ec3e6beff245300bdf214a
3+
sha256=028bb962bd07c2e8ac467c279d130d4c00cd4a4e89b09ad427035578922e65ce
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6058676df6dc6e3a12a4773dc69081b4f0d32924
1+
156829d6b333b1dfefcb3c61d32d93bf0c6f0a01

build/pkgs/fflas_ffpack/spkg-install.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FFLAS_FFPACK_CONFIGURE="$SAGE_CONFIGURE_FFLAS_FFPACK $FFLAS_FFPACK_CONFIGURE"
2020

2121
# If SAGE_FAT_BINARY is set, disable all processor-specific optimizations
2222
if [ "$SAGE_FAT_BINARY" = yes ]; then
23-
FFLAS_FFPACK_CONFIGURE="--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2 --disable-avx512f --disable-avx512dq --disable-avx512vl $FFLAS_FFPACK_CONFIGURE"
23+
FFLAS_FFPACK_CONFIGURE="--without-archnative $FFLAS_FFPACK_CONFIGURE"
2424
fi
2525

2626
# Need to use 'bash' for configure, see

build/pkgs/givaro/spkg-install.in

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

77
# When SAGE_FAT_BINARY is set, disable processor-specific optimizations
88
if [ "$SAGE_FAT_BINARY" = yes ]; then
9-
GIVARO_CONFIGURE="--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2 $GIVARO_CONFIGURE"
9+
GIVARO_CONFIGURE="--without-archnative $GIVARO_CONFIGURE"
1010
fi
1111

1212
cp "$SAGE_ROOT"/config/config.* build-aux/

build/pkgs/linbox/spkg-install.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export CPPFLAGS="$CPPFLAGS -DDISABLE_COMMENTATOR"
1515

1616
# If SAGE_FAT_BINARY is set, disable dependency that be discovered on the building system.
1717
if [ "$SAGE_FAT_BINARY" = yes ]; then
18-
LINBOX_CONFIGURE="--disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2 --without-ocl $LINBOX_CONFIGURE"
18+
LINBOX_CONFIGURE="--without-archnative --without-ocl $LINBOX_CONFIGURE"
1919
fi
2020

2121
# Disable fplll as version 5.x is not supported by linbox <= 1.5.0.

0 commit comments

Comments
 (0)