commit c2476f69fca0a04ed8196e0c0026ee5ac97b0a8d Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 14:37:07 2023 +0100 coin-or-cgl: pulled patches from libreoffice diff --git a/coin-or-cgl/.signature b/coin-or-cgl/.signature index ddde77391..dc2727847 100644 --- a/coin-or-cgl/.signature +++ b/coin-or-cgl/.signature @@ -1,5 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+IAUSk2evIuBe1bz1rLmn8/zKTqyaume0zdBA/P0yTrt2MYFUAHARQlWOL6tpm/UnjAkS/0KEF+5vijH53ADAk= -SHA256 (Pkgfile) = 05ea5b7dca829b7dc2feafd8dfec8b3ffae9c046f4aa96bbafefd2cf4bbbded3 +RWSagIOpLGJF3/Bq20IFxmhIKqEPB4HHilplle+ReRUCwXiihJoVUVCbiQm8FIz7efDduqkvXAEolSBsB/X6zyG7TvbaqkdVgAw= +SHA256 (Pkgfile) = 08a36ec4388227b8209425a6acab61d464cbd9ff29afd8ffb584103a86aaf37d SHA256 (.footprint) = 4213d1e609b786a24adfbc8cf4938487c491e2a51ed5e6d495f7eb7359145f07 SHA256 (coin-or-cgl-0.60.6.tar.gz) = 9e2c51ffad816ab408763d6b931e2a3060482ee4bf1983148969de96d4b2c9ce +SHA256 (configure-exit.patch) = 6305b5cc7b1742028da597435e3bb3d4a8dca3e8d522c67001556f1d5c89636d +SHA256 (libtool.patch) = 19e6e14f0686b110cfc61fbcbd8f261b8d91234b1245fbc715ca0f3e1304fa10 +SHA256 (rpath.patch) = e30053c93cc9b9baf030127772bbbc8732e6d64cfec8632bf0f78c54bacbad7f diff --git a/coin-or-cgl/Pkgfile b/coin-or-cgl/Pkgfile index 6717b7a4a..0d397c80d 100644 --- a/coin-or-cgl/Pkgfile +++ b/coin-or-cgl/Pkgfile @@ -5,11 +5,19 @@ name=coin-or-cgl version=0.60.6 -release=1 -source=(https://github.com/coin-or/Cgl/archive/releases/$version/$name-$version.tar....) +release=2 +source=(https://github.com/coin-or/Cgl/archive/releases/$version/$name-$version.tar.... + configure-exit.patch + libtool.patch + rpath.patch) build() { cd Cgl-releases-$version/Cgl + + 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)" \ @@ -20,7 +28,9 @@ build() { --with-coinutils-incdir="/usr/include/coin/" \ --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-cgl/configure-exit.patch b/coin-or-cgl/configure-exit.patch new file mode 100644 index 000000000..23144036f --- /dev/null +++ b/coin-or-cgl/configure-exit.patch @@ -0,0 +1,11 @@ +--- Cgl/configure ++++ Cgl/configure +@@ -3501,8 +3501,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-cgl/libtool.patch b/coin-or-cgl/libtool.patch new file mode 100644 index 000000000..8c1d7c095 --- /dev/null +++ b/coin-or-cgl/libtool.patch @@ -0,0 +1,27 @@ +--- Cgl/ltmain.sh ++++ Cgl/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-cgl/rpath.patch b/coin-or-cgl/rpath.patch new file mode 100644 index 000000000..decc82cbb --- /dev/null +++ b/coin-or-cgl/rpath.patch @@ -0,0 +1,10 @@ +--- Cgl/configure ++++ Cgl/configure +@@ -12455,6 +12455,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