Skip to content

Commit

Permalink
gh-38020: Workaround for passing givaro library to linker on OSX
Browse files Browse the repository at this point in the history
    
Just hack the missing -lgivaro into the linker command, see also
linbox-team/fflas-ffpack#391 for the real bug

Closes #38002
    
URL: #38020
Reported by: Volker Braun
Reviewer(s):
  • Loading branch information
Release Manager committed May 23, 2024
2 parents 62089f7 + 8354962 commit 10c4e78
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions build/pkgs/fflas_ffpack/spkg-install.in
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
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;

0 comments on commit 10c4e78

Please sign in to comment.