Skip to content

Commit 415f2bf

Browse files
author
MarcoFalke
committed
Merge #13095: build: update ax_boost_chrono/unit_test_framework
aa85dcf build: sync ax_boost_chrono/unit_test (fanquake) Pull request description: [ax_boost_chrono](https://github.com/bitcoin/bitcoin/blob/master/build-aux/m4/ax_boost_chrono.m4) and [ax_boost_unit_test_framework](https://github.com/bitcoin/bitcoin/blob/master/build-aux/m4/ax_boost_unit_test_framework.m4) were updated from upstream in #12678. However some minor upstream changes were missed. Pull those changes in here so these files actually reflect their upstream serial. Tree-SHA512: 71d9ee7a1616d9d36e6f63dedb6687918c3662bde724cdda1fdf3eb039c8973acd166273876a9b2671a7e087149fcf956552f9f2b946e5ee1835d12944c0065d
2 parents 29b4ee6 + aa85dcf commit 415f2bf

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

build-aux/m4/ax_boost_chrono.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ AC_DEFUN([AX_BOOST_CHRONO],
8181
8282
LDFLAGS_SAVE=$LDFLAGS
8383
if test "x$ax_boost_user_chrono_lib" = "x"; then
84-
ax_lib=
8584
for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do
8685
ax_lib=${libextension}
8786
AC_CHECK_LIB($ax_lib, exit,
@@ -106,7 +105,7 @@ AC_DEFUN([AX_BOOST_CHRONO],
106105
107106
fi
108107
if test "x$ax_lib" = "x"; then
109-
AC_MSG_ERROR(Could not find a version of the boost_chrono library!)
108+
AC_MSG_ERROR(Could not find a version of the library!)
110109
fi
111110
if test "x$link_chrono" = "xno"; then
112111
AC_MSG_ERROR(Could not link against $ax_lib !)

build-aux/m4/ax_boost_unit_test_framework.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
7676
7777
if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
7878
saved_ldflags="${LDFLAGS}"
79-
ax_lib=
8079
for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.dylib* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do
8180
if test -r $monitor_library ; then
8281
libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a.*$;\1;'`
@@ -125,7 +124,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
125124
done
126125
fi
127126
if test "x$ax_lib" = "x"; then
128-
AC_MSG_ERROR(Could not find a version of the boost_unit_test_framework library!)
127+
AC_MSG_ERROR(Could not find a version of the library!)
129128
fi
130129
if test "x$link_unit_test_framework" != "xyes"; then
131130
AC_MSG_ERROR(Could not link against $ax_lib !)

0 commit comments

Comments
 (0)