diff --git a/coin-or-osi/.signature b/coin-or-osi/.signature index 63409d1c4..49b7d70ec 100644 --- a/coin-or-osi/.signature +++ b/coin-or-osi/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33Hl33MxSHSjjBjLgMNd7SkWENPvVwCQ58R8kY1bIpW3Oon3ftvHDBW5Oj7vJ283Xb5akeYGzm9lTwBSY/goeQY= -SHA256 (Pkgfile) = 570ed48d936aa88c6e36cf44140d452f1b73b928ec936465f1afc4716c80a46b +RWSagIOpLGJF30Kwg1oLU4Y+683v4gLY1HW0ts2HJeG56wvFDyPM3WDm6gXFHXnL/trZ+qGGAKyloXo/2fbpyj0+qHiScTSCpww= +SHA256 (Pkgfile) = 721523e52e976a57dab66c5f00414747f908385cb323f3e57fb2fdebc0c1f103 SHA256 (.footprint) = 8e25cc4d888b307bfc6c0ca71795d9ef2840205126c7587805392a3af401e333 SHA256 (coin-or-osi-0.108.7.tar.gz) = f1bc53a498585f508d3f8d74792440a30a83c8bc934d0c8ecf8cd8bc0e486228 +SHA256 (libtool.patch) = d1e46ba425585bdc9faa0c943a6d7327688aa88e5528fb71a11979eedce6cedc +SHA256 (rpath.patch) = f65509337f9b34b6a838e9cf47f28dd1141213a62e86c15e70f4757245204123 diff --git a/coin-or-osi/Pkgfile b/coin-or-osi/Pkgfile index fbc6e2d89..c2597c4dd 100644 --- a/coin-or-osi/Pkgfile +++ b/coin-or-osi/Pkgfile @@ -5,18 +5,26 @@ name=coin-or-osi version=0.108.7 -release=1 -source=(https://github.com/coin-or/Osi/archive/releases/$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/coin-or/Osi/archive/releases/$version/$name-$version.tar.gz + libtool.patch + rpath.patch) build() { cd Osi-releases-$version + + patch -Np1 -i $SRC/libtool.patch + patch -Np1 -i $SRC/rpath.patch + COIN_SKIP_PROJECTS="Sample" \ ./configure --prefix=/usr \ --enable-dependency-linking \ --with-coinutils-lib="$(pkg-config --libs coinutils)" \ --with-coinutils-incdir="/usr/include/coin/" make + PKG_CONFIG_LIBDIR="${PKG}/usr/lib/pkgconfig/" \ make DESTDIR="$PKG" install + rm -fr $PKG/usr/share/coin/doc } diff --git a/coin-or-osi/libtool.patch b/coin-or-osi/libtool.patch new file mode 100644 index 000000000..e0830d4cb --- /dev/null +++ b/coin-or-osi/libtool.patch @@ -0,0 +1,27 @@ +--- Osi/ltmain.sh ++++ Osi/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-osi/rpath.patch b/coin-or-osi/rpath.patch new file mode 100644 index 000000000..c352d32b5 --- /dev/null +++ b/coin-or-osi/rpath.patch @@ -0,0 +1,10 @@ +--- Osi/configure ++++ Osi/configure +@@ -12453,6 +12453,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