Skip to content

Commit acec0cd

Browse files
committed
adol-c: Fix dependencies
1 parent 899c456 commit acec0cd

2 files changed

Lines changed: 24 additions & 6 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- a/configure.ac
2+
+++ b/configure.ac
3+
@@ -347,11 +347,9 @@
4+
AC_LANG_PUSH([C++])
5+
AC_CHECK_HEADERS([boost/pool/pool_alloc.hpp])
6+
AC_LANG_POP([C++])
7+
-AX_BOOST_SYSTEM
8+
-LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $BOOST_SYSTEM_LIB"
9+
fi
10+
11+
-if test "x$want_boost" = xyes -a "x$boost_new" = xyes -a "x$ac_cv_header_boost_pool_pool_alloc_hpp" = xyes -a "x$link_system" = xyes ; then
12+
+if test "x$want_boost" = xyes -a "x$boost_new" = xyes -a "x$ac_cv_header_boost_pool_pool_alloc_hpp" = xyes ; then
13+
using_boost_pool=yes
14+
USE_BOOST_POOL="#define USE_BOOST_POOL 1"
15+
else

mingw-w64-adol-c/PKGBUILD

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,32 @@ _realname=adol-c
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=2.7.2
7-
pkgrel=6
7+
pkgrel=7
88
pkgdesc='Automatic Differentiation of Algorithms written in C/C++ (mingw-w64)'
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
1111
url='https://github.com/coin-or/ADOL-C'
1212
license=('spdx:EPL-1.0')
13-
depends=("${MINGW_PACKAGE_PREFIX}-boost"
13+
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
1414
"${MINGW_PACKAGE_PREFIX}-omp")
1515
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
16-
"${MINGW_PACKAGE_PREFIX}-autotools")
17-
source=(https://github.com/coin-or/ADOL-C/archive/releases/${pkgver}.tar.gz)
18-
sha256sums=('701E0856BAAE91B98397960D5E0A87A549988DE9D4002D0E9A56FA08F5455F6E')
16+
"${MINGW_PACKAGE_PREFIX}-autotools"
17+
"${MINGW_PACKAGE_PREFIX}-boost")
18+
source=(https://github.com/coin-or/ADOL-C/archive/releases/${pkgver}/${_realname}-${pkgver}.tar.gz
19+
001-do-not-search-for-boost-system.patch)
20+
sha256sums=('701e0856baae91b98397960d5e0a87a549988de9d4002d0e9a56fa08f5455f6e'
21+
'4f1b56a6399b5fafc4a0344cd47a927aa8cbe1c81e16e2e5e27bb552c1b12e85')
1922

2023
prepare() {
2124
cd ${_realname}-releases-${pkgver}
25+
patch -p1 -i "${srcdir}"/001-do-not-search-for-boost-system.patch
2226
autoreconf -fi
2327
}
2428

2529
build() {
2630
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
2731

2832
local -a extra_config
29-
3033
extra_config+=(--with-openmp-flag="-fopenmp")
3134
if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
3235
LDFLAGS+=" -lomp"

0 commit comments

Comments
 (0)