coin-or-cbc: pulled patches from libreoffice

coin-or-cbc/.signature

@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF36dBIsF/JFgI6kNkxZcCDKwS+glXseDY1Iv8wYVFGwcWX0FNqg69AVnyMiSOjd5GaVOU6aRXiQkvFg04H9mh+wU=
-SHA256 (Pkgfile) = 7a36fe9ec54e06e7c2c6a1d4c3028cf337d401d457f80c53288a2ea729264024
+RWSagIOpLGJF37sJ/k3j0Lc72U79duLwiB+yyH+o5S4xUqfsqX3gnu8BN4AQ91t6M981Lx7kbYivjVB9bwvCiUFxtSnkxhYCewQ=
+SHA256 (Pkgfile) = 7e61a0d7ddce90922fd3ecbccf66b92743ad17bdda006f6eb74a2d26f6017e19
 SHA256 (.footprint) = ef3262dff818eb16e24e342b419fefb256a21ceef74d4a3485cf9475524b3895
 SHA256 (coin-or-cbc-2.10.8.tar.gz) = 8525abb541ee1b8e6ff03b00411b66e98bbc58f95be1aefd49d2bca571be2eaf
+SHA256 (libtool.patch) = ac19ee9b8092f0c5a2ebd19febc7e9808e2c96fec7fceabc743d08f8e2eb128f
+SHA256 (rpath.patch) = 31f1854bb5d8cd84186d86eab668afb905111c55adf22dbc0a509c2b614b5118

coin-or-cbc/Pkgfile

@@ -5,11 +5,17 @@
 
 name=coin-or-cbc
 version=2.10.8
-release=1
-source=(https://github.com/coin-or/Cbc/archive/releases/$version/$name-$version.tar.gz)
+release=2
+source=(https://github.com/coin-or/Cbc/archive/releases/$version/$name-$version.tar.gz
+  libtool.patch
+  rpath.patch)
 
 build() {
   cd Cbc-releases-$version
+
+  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)" \
@@ -23,7 +29,9 @@ build() {
     --enable-dependency-linking \
     --enable-cbc-parallel
   make
+
   PKG_CONFIG_LIBDIR="$PKG"/usr/lib/pkgconfig/ \
   make DESTDIR=$PKG install
+
   rm -fr $PKG/usr/share/coin/doc
 }

coin-or-cbc/libtool.patch

@@ -0,0 +1,27 @@
+--- Cbc/ltmain.sh
++++ Cbc/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-cbc/rpath.patch

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