Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 60 additions & 0 deletions ports/coin-or-buildtools/disable-mkl.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
diff --git a/coin_chk_lapack.m4 b/coin_chk_lapack.m4
index 3314f97..0156a0e 100644
--- a/coin_chk_lapack.m4
+++ b/coin_chk_lapack.m4
@@ -113,55 +113,7 @@ dnl can arrange that explicitly.
esac
;;

- *-cygwin* | *-mingw* | *-msys*)
-dnl Check for 64-bit sequential MKL in $LIB
- old_IFS="$IFS"
- IFS=";"
- coin_mkl=""
- for d in $LIB ; do
- # turn $d into unix-style short path (no spaces); cannot do -us,
- # so first do -ws, then -u
- d=`cygpath -ws "$d"`
- d=`cygpath -u "$d"`
- if test "$enable_shared" = yes ; then
- if test -e "$d/mkl_core_dll.lib" ; then
- case " $2 " in
- *\ int64\ * ) coin_mkl="$d/mkl_intel_ilp64_dll.lib $d/mkl_sequential_dll.lib $d/mkl_core_dll.lib" ;;
- *) coin_mkl="$d/mkl_intel_lp64_dll.lib $d/mkl_sequential_dll.lib $d/mkl_core_dll.lib" ;;
- esac
- break
- fi
- else
- if test -e "$d/mkl_core.lib" ; then
- case " $2 " in
- *\ int64\ * ) coin_mkl="$d/mkl_intel_ilp64.lib $d/mkl_sequential.lib $d/mkl_core.lib" ;;
- *) coin_mkl="$d/mkl_intel_lp64.lib $d/mkl_sequential.lib $d/mkl_core.lib" ;;
- esac
- break
- fi
- fi
- done
- IFS="$old_IFS"
- if test -n "$coin_mkl" ; then
- AC_COIN_TRY_LINK([dsyev],[$coin_mkl],[],
- [coin_has_lapack=yes
- lapack_lflags="$coin_mkl"
- lapack_what="Intel MKL ($lapack_lflags)"
- ],,no)
- fi
- ;;
-
*-darwin*)
- case " $2 " in
- *\ int64\ * ) coin_mkl="-lmkl_intel_ilp64 -lmkl_sequential -lmkl_core -lm" ;;
- *) coin_mkl="-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lm" ;;
- esac
- AC_COIN_TRY_LINK([dsyev],
- [$coin_mkl],[],
- [coin_has_lapack=yes
- lapack_lflags="$coin_mkl"
- lapack_what="Intel MKL ($lapack_lflags)"
- ],,no)
if test "$coin_has_lapack" = no ; then
case " $2 " in
*\ int64\ * ) ;;
1 change: 1 addition & 0 deletions ports/coin-or-buildtools/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ vcpkg_from_github(
SHA512 c142163a270848d1e1300a70713ee03ec822cc9d7583ba7aa685c02b7c25e0d4c0f7d958aad320dbf1824cc88fe0a49dc3357e0fe11588dc8c30e7fec8d239f6
PATCHES buildtools.patch
buildtools2.patch
disable-mkl.diff
)

file(COPY "${BUILD_SCRIPTS_PATH}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/BuildTools")
Expand Down
1 change: 1 addition & 0 deletions ports/coin-or-buildtools/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "coin-or-buildtools",
"version-date": "2023-02-02",
"port-version": 1,
"description": "Macros and patches for GNU autotools ",
"homepage": "https://coin-or-tools.github.io/BuildTools/",
"license": "EPL-2.0"
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1862,7 +1862,7 @@
},
"coin-or-buildtools": {
"baseline": "2023-02-02",
"port-version": 0
"port-version": 1
},
"coin-or-cbc": {
"baseline": "2024-06-04",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/coin-or-buildtools.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9c512b1216f88b2c98a9944c43131fad4de9fdd5",
"version-date": "2023-02-02",
"port-version": 1
},
{
"git-tree": "b0d17057d8452f7e7fa4a3bfe6a2fab3520be6e9",
"version-date": "2023-02-02",
Expand Down