From faab9ad4e2cb2f99d5f23aa7fa71a4724076729c Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 10 Feb 2024 10:51:08 +0100 Subject: [PATCH] coin-or-clp: fixed finding cholmod.h --- coin-or-clp/.signature | 4 ++-- coin-or-clp/Pkgfile | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/coin-or-clp/.signature b/coin-or-clp/.signature index d349a5bca..08570ab20 100644 --- a/coin-or-clp/.signature +++ b/coin-or-clp/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3z7B8p+/DR9IAKYw2XSRlhM42Nyxf3nK6dUax9SxWTB6VW7wSpQe2sep8JdDicijqXH0KiJ4vcOC/0r/XwhDVgA= -SHA256 (Pkgfile) = 52d77c2ff533e8c291aea6b181edfe03135318fb82763fe2a648f5c452e14a53 +RWSagIOpLGJF34ayeKdHuw4dTGvCym3mVLHdff38+80a58rknKiT6TnOosHXvej/wq7cr8E1eVyN4riC/DxavO/S+aJxm/Xgmg8= +SHA256 (Pkgfile) = 80534a6118da37377b50f7498307a099877e730ce44f17984277d11fe0c557ac SHA256 (.footprint) = 35b2940544ec893447b85a3e45f286e71a57726a3d406c41f66babffc237dd79 SHA256 (coin-or-clp-1.17.9.tar.gz) = b02109be54e2c9c6babc9480c242b2c3c7499368cfca8c0430f74782a694a49f SHA256 (configure-exit.patch) = 79e506c72d85ab12fdbd1eb9866f5fc73b5adca8e58793e7d173239987d0808e diff --git a/coin-or-clp/Pkgfile b/coin-or-clp/Pkgfile index c3556c3b0..fadcae6ef 100644 --- a/coin-or-clp/Pkgfile +++ b/coin-or-clp/Pkgfile @@ -5,7 +5,7 @@ name=coin-or-clp version=1.17.9 -release=1 +release=2 source=(https://github.com/coin-or/Clp/archive/releases/$version/$name-$version.tar.gz configure-exit.patch libtool.patch @@ -24,11 +24,13 @@ build() { --with-osi-incdir="/usr/include/coin/" \ --with-coinutils-lib="$(pkg-config --libs coinutils)" \ --with-coinutils-incdir="/usr/include/coin/" \ - --with-cholmod-lib='-lcholmod' --with-cholmod-incdir=/usr/include + --with-cholmod-lib='-lcholmod' \ + --with-cholmod-incdir=/usr/include/suitesparse + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make - PKG_CONFIG_LIBDIR="$PKG"/usr/lib/pkgconfig/ \ - make DESTDIR="$PKG" install + make DESTDIR=$PKG install rm -fr $PKG/usr/share/coin/doc }