Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround for passing givaro library to linker on OSX #38020

Merged
merged 1 commit into from
May 25, 2024
Merged

Workaround for passing givaro library to linker on OSX #38020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions build/pkgs/fflas_ffpack/spkg-install.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ if [ -z "$CONFIG_SHELL" ]; then
export CONFIG_SHELL=`command -v bash`
fi

# Dirty workaround to link on OSX
# https://github.com/linbox-team/fflas-ffpack/issues/391
# https://github.com/sagemath/sage/issues/38002
if [ "$UNAME" = Darwin ]; then
LDFLAGS="-lgivaro $LDFLAGS"
fi

# We disable openmp because of build failures, see
# https://github.com/sagemath/sage/issues/17635#comment:67
sdh_configure --with-default="$SAGE_LOCAL" --with-blas-libs="$LINBOX_BLAS" \
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/linbox/patches/310-backport.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ index 59006d6c5f..2604f47b81 100644
+ const_cast<data_it>(_data_beg) = iter._data_beg ;
+ const_cast<data_it>(_data_end) = iter._data_end ;
+ const_cast<Field &>(_field) = iter._field ;
+ const_cast<size_t&>(ld) = iter._ld ;
+ const_cast<size_t&>(_ld) = iter._ld ;
_row = iter._row ;

return *this;
Expand All @@ -48,7 +48,7 @@ index 498a5525db..a60943868b 100644
+ const_cast<element_iterator>(_data_end)= iter._data_end ;
+ const_cast<Field &>(_field) = iter._field ;
+ const_cast<std::vector<size_t>&>(_rowid) = iter._rowid;
+ const_cast<size_t&>(ld) = iter._ld ;
+ const_cast<size_t&>(_ld) = iter._ld ;
_row = iter._row ;

return *this;
Expand All @@ -63,7 +63,7 @@ index 498a5525db..a60943868b 100644
+ const_cast<data_it>(_data_beg) = iter._data_beg ;
+ const_cast<data_it>(_data_end) = iter._data_end ;
+ const_cast<Field &>(_field) = iter._field ;
+ const_cast<size_t&>(ld)= iter._ld ;
+ const_cast<size_t&>(_ld)= iter._ld ;
_row = iter._row ;

return *this;
Loading