coin-or-clp: pulled patches from libreoffice

coin-or-clp/.signature

@@ -1,5 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35ZIwoYG0BnSDSauwMepC7ZOKX6AtwU8sYS7jfu5G0SjwnT3H0wCt2XZ5yVdJzYoGPQMtMppkAwhpjO5/TJLMgE=
-SHA256 (Pkgfile) = 4ee21f1fea6fabc2e9f8320470b0cb2d32b21758ae874081dc26c7a7a3b4e4d2
+RWSagIOpLGJF3/mrJrRXfQ/HiHZHF7V7PiBak7hdne9wzAJUPLgK/mfcVtgcwohx8zwBV0rdusvK79PNkCeNuCw5mwOJucOipAY=
+SHA256 (Pkgfile) = 67c6faf3082db548efb0eb2730e3ef6270df44e48814e7be4ef3a291e507453b
 SHA256 (.footprint) = 186e9e60f8aa1e1cfd29ecb9c5df2a2a355ff0b2a477c80e9785385f889cab54
 SHA256 (coin-or-clp-1.17.7.tar.gz) = c4c2c0e014220ce8b6294f3be0f3a595a37bef58a14bf9bac406016e9e73b0f5
+SHA256 (configure-exit.patch) = 79e506c72d85ab12fdbd1eb9866f5fc73b5adca8e58793e7d173239987d0808e
+SHA256 (libtool.patch) = 4781834cb3e60e2c83ed2ec7acf0e0443804426a7fc74399287e4c75794a3fc8
+SHA256 (rpath.patch) = 1e42a2cc6bde21e5f00953f7003adccbcf21b060c0aa12688dfc341738746422

coin-or-clp/Pkgfile

@@ -5,11 +5,19 @@
 
 name=coin-or-clp
 version=1.17.7
-release=1
-source=(https://github.com/coin-or/Clp/archive/releases/$version/$name-$version.tar.gz)
+release=2
+source=(https://github.com/coin-or/Clp/archive/releases/$version/$name-$version.tar.gz
+  configure-exit.patch
+  libtool.patch
+  rpath.patch)
 
 build() {
   cd Clp-releases-$version/Clp
+
+  patch -Np1 -i $SRC/configure-exit.patch
+  patch -Np1 -i $SRC/libtool.patch
+  patch -Np1 -i $SRC/rpath.patch
+
   COIN_SKIP_PROJECTS="Sample" \
   ./configure --prefix=/usr \
     --with-osi-lib="$(pkg-config --libs osi)" \
@@ -18,7 +26,9 @@ build() {
     --with-coinutils-incdir="/usr/include/coin/" \
     --with-cholmod-lib='-lcholmod' --with-cholmod-incdir=/usr/include
   make
+
   PKG_CONFIG_LIBDIR="$PKG"/usr/lib/pkgconfig/ \
   make DESTDIR="$PKG" install
+
   rm -fr $PKG/usr/share/coin/doc
 }

coin-or-clp/configure-exit.patch

@@ -0,0 +1,11 @@
+--- Clp/configure
++++ Clp/configure
+@@ -3528,8 +3528,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);'

coin-or-clp/libtool.patch

@@ -0,0 +1,27 @@
+--- Clp/ltmain.sh
++++ Clp/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

coin-or-clp/rpath.patch

@@ -0,0 +1,10 @@
+--- Clp/configure
++++ Clp/configure
+@@ -12482,6 +12482,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