From e65738d05bc8049289f9b29e1c5aab6a9a2c7803 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Sat, 28 Jan 2023 14:32:16 +0100
Subject: [PATCH] coin-or-coinutils: pulled patches from libreoffice

---
 coin-or-coinutils/.signature           |  7 +++++--
 coin-or-coinutils/Pkgfile              | 16 ++++++++++++---
 coin-or-coinutils/configure-exit.patch | 11 +++++++++++
 coin-or-coinutils/libtool.patch        | 27 ++++++++++++++++++++++++++
 coin-or-coinutils/rpath.patch          | 10 ++++++++++
 5 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 coin-or-coinutils/configure-exit.patch
 create mode 100644 coin-or-coinutils/libtool.patch
 create mode 100644 coin-or-coinutils/rpath.patch

diff --git a/coin-or-coinutils/.signature b/coin-or-coinutils/.signature
index 46caaab38..761674743 100644
--- a/coin-or-coinutils/.signature
+++ b/coin-or-coinutils/.signature
@@ -1,5 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3ylwDmOKzRp9IpYpPZA/na5gK6YTCQRDKexv/KoA9sLTjWWr7+znkqZJq1z5fY7EpcL01YdJGR3TSijuPTpyIQo=
-SHA256 (Pkgfile) = 2f39d3fa860b79cb53c59d0aa7b7643079efc8bcaa95ada64a0d14fa076940c1
+RWSagIOpLGJF34KlaLjQDy08CDE705pB1NLiyRyhSnn8k3d8EFuaQV/W2jLr7TvCYtS7odBXUg8LpO8PUNoOp91flPbyicJ5nA8=
+SHA256 (Pkgfile) = 120399f20c814b277ba2548c288548f8dd391f60696979a5ee46ca213a5c7daf
 SHA256 (.footprint) = f3df72d5e131cec3548baaab633061117e5d939fafb837dd629aec2e765346fd
 SHA256 (coin-or-coinutils-2.11.6.tar.gz) = 6ea31d5214f7eb27fa3ffb2bdad7ec96499dd2aaaeb4a7d0abd90ef852fc79ca
+SHA256 (configure-exit.patch) = 092ad1d6a5bcf5ff4a52bf894531609e4c9dc6e37d262c221074bcec4dd3c8b2
+SHA256 (libtool.patch) = ac6887ade7094bf3c40c58428e0213f87338b9a97c58e9b31bc65c6fdf075bfb
+SHA256 (rpath.patch) = d434b989e10235a53aaa01b1354b9d1600778cee978ce90c0a60f8f789bb0d4f
diff --git a/coin-or-coinutils/Pkgfile b/coin-or-coinutils/Pkgfile
index 011ea9c60..e54274545 100644
--- a/coin-or-coinutils/Pkgfile
+++ b/coin-or-coinutils/Pkgfile
@@ -1,22 +1,32 @@
 # Description: COIN-OR collection of utility classes
 # URL: https://projects.coin-or.org/CoinUtils
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: glpk lapack openblas
+# Depends on: glpk lapack
 
 name=coin-or-coinutils
 version=2.11.6
-release=1
-source=(https://github.com/coin-or/CoinUtils/archive/releases/$version/$name-$version.tar.gz)
+release=2
+source=(https://github.com/coin-or/CoinUtils/archive/releases/$version/$name-$version.tar.gz
+  configure-exit.patch
+  libtool.patch
+  rpath.patch)
 
 build() {
   cd CoinUtils-releases-$version
+
+  patch -Np1 -i $SRC/configure-exit.patch
+  patch -Np1 -i $SRC/libtool.patch
+  patch -Np1 -i $SRC/rpath.patch
+
   ./configure --prefix=/usr \
     --with-blas-lib='-lblas' \
     --with-lapack-lib='-llapack' \
     --with-glpk-lib='-lglpk' \
     --enable-dependency-linking
   make
+
   PKG_CONFIG_LIBDIR=$PKG/usr/lib/pkgconfig/ \
   make DESTDIR=$PKG install
+
   rm -fr $PKG/usr/share/coin/doc
 }
diff --git a/coin-or-coinutils/configure-exit.patch b/coin-or-coinutils/configure-exit.patch
new file mode 100644
index 000000000..a25e89103
--- /dev/null
+++ b/coin-or-coinutils/configure-exit.patch
@@ -0,0 +1,11 @@
+--- CoinUtils/configure
++++ CoinUtils/configure
+@@ -3527,8 +3527,6 @@
+ fi
+ for ac_declaration in \
+    '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+    'extern "C" void exit (int);' \
+    'void exit (int);'
diff --git a/coin-or-coinutils/libtool.patch b/coin-or-coinutils/libtool.patch
new file mode 100644
index 000000000..15e18c5de
--- /dev/null
+++ b/coin-or-coinutils/libtool.patch
@@ -0,0 +1,27 @@
+--- CoinUtils/ltmain.sh
++++ CoinUtils/ltmain.sh
+@@ -1254,6 +1254,12 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	mllvm)
++	  # Clang does not use LLVM to link, so we can simply discard any
++	  # '-mllvm $arg' options when doing the link step.
++	  prev=
++	  continue
++	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+@@ -1607,6 +1613,11 @@
+ 	continue
+ 	;;
+ 
++      -mllvm)
++	prev=mllvm
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
diff --git a/coin-or-coinutils/rpath.patch b/coin-or-coinutils/rpath.patch
new file mode 100644
index 000000000..d366b49e3
--- /dev/null
+++ b/coin-or-coinutils/rpath.patch
@@ -0,0 +1,10 @@
+--- CoinUtils/configure
++++ CoinUtils/configure
+@@ -13939,6 +13939,7 @@
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+     esac
++hardcode_libdir_flag_spec_CXX=
+     ;;
+   lynxos*)
+     # FIXME: insert proper C++ library support