diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-04 08:07:28 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-04 08:10:17 +0200 |
| commit | cd1e7bb064315ce909dfa1a0a14a5660d985f266 (patch) | |
| tree | 148c65755427d4eb8fe1ea6320c830a90f4b3ae9 | |
| parent | 6db76c6bc7fe749d1576b69dd5742c5400a476eb (diff) | |
| download | bitcoin-cd1e7bb064315ce909dfa1a0a14a5660d985f266.tar.xz | |
build: Fix boost detection on Ubuntu ARM 18.04
Update ax_boost_base.m4 to version in progress: autoconf-archive/autoconf-archive#198
This is a temporary workaround for the problem in the 0.19.0 release;
please pull in the upstream version when ready (see #17010).
Tree-SHA512: ea8c4e895f5414cd307a9d809d2ec35fa8de6a733d8bf66080b67634d27cfb8b8f6256ca583a73e3ad899eebb42e6fc256ea693ae735624f968b34469c626586
| -rw-r--r-- | build-aux/m4/ax_boost_base.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/build-aux/m4/ax_boost_base.m4 b/build-aux/m4/ax_boost_base.m4 index 16fa69b41f..74537dc40f 100644 --- a/build-aux/m4/ax_boost_base.m4 +++ b/build-aux/m4/ax_boost_base.m4 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 47 +#serial 49 # example boost program (need to pass version) m4_define([_AX_BOOST_BASE_PROGRAM], @@ -126,8 +126,14 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ [multiarch_libsubdir="lib/${host_cpu}-${host_os}"] ) + dnl some arches may advertise a cpu type that doesn't line up with their + dnl prefix's cpu type. For example, uname may report armv7l while libs are + dnl installed to /usr/lib/arm-linux-gnueabihf. Try getting the compiler's + dnl value for an extra chance of finding the correct path. + libsubdirs="lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs" + dnl first we check the system location for boost libraries - dnl this location ist chosen if boost libraries are installed with the --layout=system option + dnl this location is chosen if boost libraries are installed with the --layout=system option dnl or if you install boost with RPM AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[ AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"]) |