From ce666a1d3d58b029379878f8431be6a827d093d2 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Tue, 9 May 2023 17:04:06 -0700 Subject: [PATCH 1/3] Regenerate artifacts. --- .github/workflows/ci.yml | 46 +++++++++-- builds/cmake/CMakeLists.txt | 65 +++++++++++++--- configure.ac | 150 ++++++++++++++++++------------------ 3 files changed, 170 insertions(+), 91 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fb52583..12b8119f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ jobs: icu: "" cc: "clang" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -42,6 +43,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -56,6 +58,7 @@ jobs: icu: "" cc: "gcc" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -70,6 +73,7 @@ jobs: icu: "--build-icu --with-icu" cc: "gcc" flags: "-Og -g --coverage -fPIE" + options: "--enable-isystem" packager: "apt" packages: "lcov" @@ -84,6 +88,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "brew" packages: "" @@ -98,6 +103,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" + options: "--enable-isystem" packager: "brew" packages: "" @@ -149,11 +155,16 @@ jobs: echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV fi + - name: Display CPU details + if: ${{ (runner.os == 'Linux') }} + shell: bash + run: | + lscpu + - name: Execute install.sh run: > ./install.sh - --enable-isystem - --build-dir=$LIBBITCOIN_SRC_PATH + --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} --prefix=$LIBBITCOIN_SRC_PATH/prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} @@ -207,11 +218,11 @@ jobs: run: | cat ${{ github.workspace }}/build/build-*/bootstrap.log + - name: Failure display otool output if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | otool -L ${{ github.workspace }}/test/.libs/libbitcoin-blockchain-test - - name: Failure display DYLD_PRINT_LIBRARIES if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | @@ -241,6 +252,7 @@ jobs: icu: "" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -255,6 +267,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -269,6 +282,7 @@ jobs: icu: "" cc: "gcc" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -283,6 +297,7 @@ jobs: icu: "--build-icu --with-icu" cc: "gcc" flags: "-Og -fPIE" + options: "" packager: "apt" packages: "" @@ -297,6 +312,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "brew" packages: "" @@ -311,6 +327,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" + options: "" packager: "brew" packages: "" @@ -365,10 +382,16 @@ jobs: echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV fi + - name: Display CPU details + if: ${{ (runner.os == 'Linux') }} + shell: bash + run: | + lscpu + - name: Execute install-cmake.sh run: > ./install-cmake.sh - --build-dir=$LIBBITCOIN_SRC_PATH + --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} --prefix=$LIBBITCOIN_SRC_PATH/prefix ${{ env.LINKAGE }} ${{ env.ASSERT_NDEBUG }} @@ -422,11 +445,11 @@ jobs: run: | cat ${{ github.workspace }}/build/build-*/bootstrap.log + - name: Failure display otool output if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | otool -L ${{ github.workspace }}/test/.libs/libbitcoin-blockchain-test - - name: Failure display DYLD_PRINT_LIBRARIES if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | @@ -467,6 +490,7 @@ jobs: icu: "" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -482,6 +506,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -497,6 +522,7 @@ jobs: icu: "" cc: "gcc" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -551,10 +577,16 @@ jobs: echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV fi + - name: Display CPU details + if: ${{ (runner.os == 'Linux') }} + shell: bash + run: | + lscpu + - name: Execute install-cmakepresets.sh run: > ./install-cmakepresets.sh - --build-dir=$LIBBITCOIN_SRC_PATH + --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }} --prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }} --preset=${{ matrix.preset }} ${{ env.LINKAGE }} @@ -609,11 +641,11 @@ jobs: run: | cat ${{ github.workspace }}/build/build-*/bootstrap.log + - name: Failure display otool output if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | otool -L ${{ github.workspace }}/test/.libs/libbitcoin-blockchain-test - - name: Failure display DYLD_PRINT_LIBRARIES if: ${{ failure() && (matrix.os == 'macos-latest') }} run: | diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index 0e8f4364..f787ef18 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -16,6 +16,8 @@ enable_testing() list( APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules" ) include(CheckIncludeFiles) include(CheckSymbolExists) +include(CheckCXXCompilerFlag) +include(CheckCXXSourceCompiles) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -40,32 +42,77 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON ) # Add compiler options #------------------------------------------------------------------------------ # Warn on all stuff. -add_compile_options( "-Wall" ) +check_cxx_compiler_flag( "-Wall" HAS_FLAG_WALL ) +if ( HAS_FLAG_WALL ) + add_compile_options( "-Wall" ) +else() + message( FATAL_ERROR "Compiler does not support -Wall" ) +endif() # Warn on extra stuff. -add_compile_options( "-Wextra" ) +check_cxx_compiler_flag( "-Wextra" HAS_FLAG_WEXTRA ) +if ( HAS_FLAG_WEXTRA ) + add_compile_options( "-Wextra" ) +else() + message( FATAL_ERROR "Compiler does not support -Wextra" ) +endif() # Be really annoying. -add_compile_options( "-Wpedantic" ) +check_cxx_compiler_flag( "-Wpedantic" HAS_FLAG_WPEDANTIC ) +if ( HAS_FLAG_WPEDANTIC ) + add_compile_options( "-Wpedantic" ) +else() + message( FATAL_ERROR "Compiler does not support -Wpedantic" ) +endif() # Disallow warning on style order of declarations. -add_compile_options( "-Wno-reorder" ) +check_cxx_compiler_flag( "-Wno-reorder" HAS_FLAG_WNO-REORDER ) +if ( HAS_FLAG_WNO-REORDER ) + add_compile_options( "-Wno-reorder" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-reorder" ) +endif() # Suppress warning for incomplete field initialization. -add_compile_options( "-Wno-missing-field-initializers" ) +check_cxx_compiler_flag( "-Wno-missing-field-initializers" HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS ) +if ( HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS ) + add_compile_options( "-Wno-missing-field-initializers" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-missing-field-initializers" ) +endif() # Conform to style. -add_compile_options( "-Wno-missing-braces" ) +check_cxx_compiler_flag( "-Wno-missing-braces" HAS_FLAG_WNO-MISSING-BRACES ) +if ( HAS_FLAG_WNO-MISSING-BRACES ) + add_compile_options( "-Wno-missing-braces" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-missing-braces" ) +endif() # Ignore comments within comments or commenting of backslash extended lines. -add_compile_options( "-Wno-comment" ) +check_cxx_compiler_flag( "-Wno-comment" HAS_FLAG_WNO-COMMENT ) +if ( HAS_FLAG_WNO-COMMENT ) + add_compile_options( "-Wno-comment" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-comment" ) +endif() # Suppress warning for copy of implicitly generated copy constructor. -add_compile_options( "-Wno-deprecated-copy" ) +check_cxx_compiler_flag( "-Wno-deprecated-copy" HAS_FLAG_WNO-DEPRECATED-COPY ) +if ( HAS_FLAG_WNO-DEPRECATED-COPY ) + add_compile_options( "-Wno-deprecated-copy" ) +else() + message( FATAL_ERROR "Compiler does not support -Wno-deprecated-copy" ) +endif() # Conflict in stdlib under clang. if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - add_compile_options( "-Wno-mismatched-tags" ) + check_cxx_compiler_flag( "-Wno-mismatched-tags" HAS_FLAG_WNO-MISMATCHED-TAGS ) + if ( HAS_FLAG_WNO-MISMATCHED-TAGS ) + add_compile_options( "-Wno-mismatched-tags" ) + else() + message( FATAL_ERROR "Compiler does not support -Wno-mismatched-tags" ) + endif() endif() # Implement -Dwith-consensus and define WITH_CONSENSUS. diff --git a/configure.ac b/configure.ac index d428d841..f6293b70 100644 --- a/configure.ac +++ b/configure.ac @@ -146,81 +146,6 @@ AC_ARG_ENABLE([isystem], AC_MSG_RESULT([$enable_isystem]) -# Check dependencies. -#============================================================================== -# Require Boost of at least version 1.72.0 and output ${boost_CPPFLAGS/LDFLAGS}. -#------------------------------------------------------------------------------ -AS_CASE([${CC}], [*], - [AX_BOOST_BASE([1.72.0], - [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}]) - AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]) - AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}]) - AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}]) - AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}]) - AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])], - [AC_MSG_ERROR([Boost 1.72.0 or later is required but was not found.])])]) - -AS_CASE([${enable_isystem}],[yes], - [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])], - [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_CPPFLAGS}])]) - -AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}]) - -AS_CASE([${with_tests}], [yes], - [AX_BOOST_UNIT_TEST_FRAMEWORK - AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}]) - AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])], - [AC_SUBST([boost_unit_test_framework_LIBS], [])]) - -# Require bitcoin-database of at least version 3.7.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}. -#------------------------------------------------------------------------------ -PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 3.7.0], - [bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 3.7.0" 2>/dev/null`" - bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 3.7.0" 2>/dev/null`"], - [AC_MSG_ERROR([libbitcoin-database >= 3.7.0 is required but was not found.])]) -AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 3.7.0']) -AC_SUBST([bitcoin_database_CPPFLAGS], [${bitcoin_database_CFLAGS}]) -AS_IF([test x${bitcoin_database_INCLUDEDIR} != "x"], - [AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], ["-isystem${bitcoin_database_INCLUDEDIR} ${bitcoin_database_OTHER_CFLAGS}"])], - [AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], [${bitcoin_database_OTHER_CFLAGS}])]) -AC_MSG_NOTICE([bitcoin_database_CPPFLAGS : ${bitcoin_database_CPPFLAGS}]) -AC_MSG_NOTICE([bitcoin_database_ISYS_CPPFLAGS : ${bitcoin_database_ISYS_CPPFLAGS}]) -AC_MSG_NOTICE([bitcoin_database_OTHER_CFLAGS : ${bitcoin_database_OTHER_CFLAGS}]) -AC_MSG_NOTICE([bitcoin_database_INCLUDEDIR : ${bitcoin_database_INCLUDEDIR}]) -AC_MSG_NOTICE([bitcoin_database_LIBS : ${bitcoin_database_LIBS}]) - -AS_CASE([${enable_isystem}],[yes], - [AC_SUBST([bitcoin_database_BUILD_CPPFLAGS], [${bitcoin_database_ISYS_CPPFLAGS}])], - [AC_SUBST([bitcoin_database_BUILD_CPPFLAGS], [${bitcoin_database_CPPFLAGS}])]) - -AC_MSG_NOTICE([bitcoin_database_BUILD_CPPFLAGS : ${bitcoin_database_BUILD_CPPFLAGS}]) - -# Require bitcoin-consensus of at least version 3.7.0 and output ${bitcoin_consensus_CPPFLAGS/LIBS/PKG}. -#------------------------------------------------------------------------------ -AS_CASE([${with_consensus}], [yes], - [PKG_CHECK_MODULES([bitcoin_consensus], [libbitcoin-consensus >= 3.7.0], - [bitcoin_consensus_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-consensus >= 3.7.0" 2>/dev/null`" - bitcoin_consensus_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-consensus >= 3.7.0" 2>/dev/null`"], - [AC_MSG_ERROR([--with-consensus specified but libbitcoin-consensus >= 3.7.0 was not found.])]) - AC_SUBST([bitcoin_consensus_PKG], ['libbitcoin-consensus >= 3.7.0']) - AC_SUBST([bitcoin_consensus_CPPFLAGS], [${bitcoin_consensus_CFLAGS}]) - AS_IF([test x${bitcoin_consensus_INCLUDEDIR} != "x"], - [AC_SUBST([bitcoin_consensus_ISYS_CPPFLAGS], ["-isystem${bitcoin_consensus_INCLUDEDIR} ${bitcoin_consensus_OTHER_CFLAGS}"])], - [AC_SUBST([bitcoin_consensus_ISYS_CPPFLAGS], [${bitcoin_consensus_OTHER_CFLAGS}])]) - AC_MSG_NOTICE([bitcoin_consensus_CPPFLAGS : ${bitcoin_consensus_CPPFLAGS}]) - AC_MSG_NOTICE([bitcoin_consensus_ISYS_CPPFLAGS : ${bitcoin_consensus_ISYS_CPPFLAGS}]) - AC_MSG_NOTICE([bitcoin_consensus_OTHER_CFLAGS : ${bitcoin_consensus_OTHER_CFLAGS}]) - AC_MSG_NOTICE([bitcoin_consensus_INCLUDEDIR : ${bitcoin_consensus_INCLUDEDIR}]) - AC_MSG_NOTICE([bitcoin_consensus_LIBS : ${bitcoin_consensus_LIBS}])], - [AC_SUBST([bitcoin_consensus_PKG], [])]) - -AS_CASE([${enable_isystem}],[yes], - [AC_SUBST([bitcoin_consensus_BUILD_CPPFLAGS], [${bitcoin_consensus_ISYS_CPPFLAGS}])], - [AC_SUBST([bitcoin_consensus_BUILD_CPPFLAGS], [${bitcoin_consensus_CPPFLAGS}])]) - -AC_MSG_NOTICE([bitcoin_consensus_BUILD_CPPFLAGS : ${bitcoin_consensus_BUILD_CPPFLAGS}]) - - # Set flags. #============================================================================== # Require c++11 for all c++ products. @@ -318,6 +243,81 @@ AS_CASE([${CC}], [*], [LDFLAGS="$LDFLAGS -fstack-protector-all"])]) +# Check dependencies. +#============================================================================== +# Require Boost of at least version 1.72.0 and output ${boost_CPPFLAGS/LDFLAGS}. +#------------------------------------------------------------------------------ +AS_CASE([${CC}], [*], + [AX_BOOST_BASE([1.72.0], + [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}]) + AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]) + AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}]) + AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}]) + AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}]) + AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])], + [AC_MSG_ERROR([Boost 1.72.0 or later is required but was not found.])])]) + +AS_CASE([${enable_isystem}],[yes], + [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])], + [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_CPPFLAGS}])]) + +AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}]) + +AS_CASE([${with_tests}], [yes], + [AX_BOOST_UNIT_TEST_FRAMEWORK + AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}]) + AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])], + [AC_SUBST([boost_unit_test_framework_LIBS], [])]) + +# Require bitcoin-database of at least version 3.7.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}. +#------------------------------------------------------------------------------ +PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 3.7.0], + [bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 3.7.0" 2>/dev/null`" + bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 3.7.0" 2>/dev/null`"], + [AC_MSG_ERROR([libbitcoin-database >= 3.7.0 is required but was not found.])]) +AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 3.7.0']) +AC_SUBST([bitcoin_database_CPPFLAGS], [${bitcoin_database_CFLAGS}]) +AS_IF([test x${bitcoin_database_INCLUDEDIR} != "x"], + [AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], ["-isystem${bitcoin_database_INCLUDEDIR} ${bitcoin_database_OTHER_CFLAGS}"])], + [AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], [${bitcoin_database_OTHER_CFLAGS}])]) +AC_MSG_NOTICE([bitcoin_database_CPPFLAGS : ${bitcoin_database_CPPFLAGS}]) +AC_MSG_NOTICE([bitcoin_database_ISYS_CPPFLAGS : ${bitcoin_database_ISYS_CPPFLAGS}]) +AC_MSG_NOTICE([bitcoin_database_OTHER_CFLAGS : ${bitcoin_database_OTHER_CFLAGS}]) +AC_MSG_NOTICE([bitcoin_database_INCLUDEDIR : ${bitcoin_database_INCLUDEDIR}]) +AC_MSG_NOTICE([bitcoin_database_LIBS : ${bitcoin_database_LIBS}]) + +AS_CASE([${enable_isystem}],[yes], + [AC_SUBST([bitcoin_database_BUILD_CPPFLAGS], [${bitcoin_database_ISYS_CPPFLAGS}])], + [AC_SUBST([bitcoin_database_BUILD_CPPFLAGS], [${bitcoin_database_CPPFLAGS}])]) + +AC_MSG_NOTICE([bitcoin_database_BUILD_CPPFLAGS : ${bitcoin_database_BUILD_CPPFLAGS}]) + +# Require bitcoin-consensus of at least version 3.7.0 and output ${bitcoin_consensus_CPPFLAGS/LIBS/PKG}. +#------------------------------------------------------------------------------ +AS_CASE([${with_consensus}], [yes], + [PKG_CHECK_MODULES([bitcoin_consensus], [libbitcoin-consensus >= 3.7.0], + [bitcoin_consensus_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-consensus >= 3.7.0" 2>/dev/null`" + bitcoin_consensus_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-consensus >= 3.7.0" 2>/dev/null`"], + [AC_MSG_ERROR([--with-consensus specified but libbitcoin-consensus >= 3.7.0 was not found.])]) + AC_SUBST([bitcoin_consensus_PKG], ['libbitcoin-consensus >= 3.7.0']) + AC_SUBST([bitcoin_consensus_CPPFLAGS], [${bitcoin_consensus_CFLAGS}]) + AS_IF([test x${bitcoin_consensus_INCLUDEDIR} != "x"], + [AC_SUBST([bitcoin_consensus_ISYS_CPPFLAGS], ["-isystem${bitcoin_consensus_INCLUDEDIR} ${bitcoin_consensus_OTHER_CFLAGS}"])], + [AC_SUBST([bitcoin_consensus_ISYS_CPPFLAGS], [${bitcoin_consensus_OTHER_CFLAGS}])]) + AC_MSG_NOTICE([bitcoin_consensus_CPPFLAGS : ${bitcoin_consensus_CPPFLAGS}]) + AC_MSG_NOTICE([bitcoin_consensus_ISYS_CPPFLAGS : ${bitcoin_consensus_ISYS_CPPFLAGS}]) + AC_MSG_NOTICE([bitcoin_consensus_OTHER_CFLAGS : ${bitcoin_consensus_OTHER_CFLAGS}]) + AC_MSG_NOTICE([bitcoin_consensus_INCLUDEDIR : ${bitcoin_consensus_INCLUDEDIR}]) + AC_MSG_NOTICE([bitcoin_consensus_LIBS : ${bitcoin_consensus_LIBS}])], + [AC_SUBST([bitcoin_consensus_PKG], [])]) + +AS_CASE([${enable_isystem}],[yes], + [AC_SUBST([bitcoin_consensus_BUILD_CPPFLAGS], [${bitcoin_consensus_ISYS_CPPFLAGS}])], + [AC_SUBST([bitcoin_consensus_BUILD_CPPFLAGS], [${bitcoin_consensus_CPPFLAGS}])]) + +AC_MSG_NOTICE([bitcoin_consensus_BUILD_CPPFLAGS : ${bitcoin_consensus_BUILD_CPPFLAGS}]) + + # Process outputs into templates. #============================================================================== AC_CONFIG_FILES([Makefile libbitcoin-blockchain.pc]) From c3fb65770137855e90fefada4a215107532b3f01 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Wed, 16 Aug 2023 17:27:34 -0700 Subject: [PATCH 2/3] Update copyright year range. --- .github/workflows/ci.yml | 2 +- Makefile.am | 2 +- autogen.sh | 2 +- build.cmd | 2 +- builds/cmake/CMakeLists.txt | 2 +- builds/cmake/modules/FindBitcoin-Consensus.cmake | 2 +- builds/cmake/modules/FindBitcoin-Database.cmake | 2 +- builds/msvc/debug.natvis | 2 +- .../libbitcoin-blockchain-test.vcxproj | 2 +- .../libbitcoin-blockchain-test.vcxproj.filters | 2 +- builds/msvc/vs2022/libbitcoin-blockchain-test/packages.config | 2 +- .../libbitcoin-blockchain-tools.vcxproj | 2 +- .../libbitcoin-blockchain-tools.vcxproj.filters | 2 +- builds/msvc/vs2022/libbitcoin-blockchain-tools/packages.config | 2 +- .../vs2022/libbitcoin-blockchain/libbitcoin-blockchain.vcxproj | 2 +- .../libbitcoin-blockchain/libbitcoin-blockchain.vcxproj.filters | 2 +- builds/msvc/vs2022/libbitcoin-blockchain/packages.config | 2 +- configure.ac | 2 +- include/bitcoin/blockchain.hpp | 2 +- include/bitcoin/blockchain/define.hpp | 2 +- include/bitcoin/blockchain/interface/block_chain.hpp | 2 +- include/bitcoin/blockchain/interface/fast_chain.hpp | 2 +- include/bitcoin/blockchain/interface/safe_chain.hpp | 2 +- include/bitcoin/blockchain/pools/block_entry.hpp | 2 +- include/bitcoin/blockchain/pools/block_organizer.hpp | 2 +- include/bitcoin/blockchain/pools/block_pool.hpp | 2 +- include/bitcoin/blockchain/pools/branch.hpp | 2 +- include/bitcoin/blockchain/pools/transaction_entry.hpp | 2 +- include/bitcoin/blockchain/pools/transaction_organizer.hpp | 2 +- include/bitcoin/blockchain/pools/transaction_pool.hpp | 2 +- include/bitcoin/blockchain/populate/populate_base.hpp | 2 +- include/bitcoin/blockchain/populate/populate_block.hpp | 2 +- include/bitcoin/blockchain/populate/populate_chain_state.hpp | 2 +- include/bitcoin/blockchain/populate/populate_transaction.hpp | 2 +- include/bitcoin/blockchain/settings.hpp | 2 +- include/bitcoin/blockchain/validate/validate_block.hpp | 2 +- include/bitcoin/blockchain/validate/validate_input.hpp | 2 +- include/bitcoin/blockchain/validate/validate_transaction.hpp | 2 +- include/bitcoin/blockchain/version.hpp | 2 +- install-cmake.sh | 2 +- install-cmakepresets.sh | 2 +- install.sh | 2 +- libbitcoin-blockchain-test_runner.sh | 2 +- libbitcoin-blockchain.pc.in | 2 +- src/interface/block_chain.cpp | 2 +- src/pools/block_entry.cpp | 2 +- src/pools/block_organizer.cpp | 2 +- src/pools/block_pool.cpp | 2 +- src/pools/branch.cpp | 2 +- src/pools/transaction_entry.cpp | 2 +- src/pools/transaction_organizer.cpp | 2 +- src/pools/transaction_pool.cpp | 2 +- src/populate/populate_base.cpp | 2 +- src/populate/populate_block.cpp | 2 +- src/populate/populate_chain_state.cpp | 2 +- src/populate/populate_transaction.cpp | 2 +- src/settings.cpp | 2 +- src/validate/validate_block.cpp | 2 +- src/validate/validate_input.cpp | 2 +- src/validate/validate_transaction.cpp | 2 +- test/block_chain.cpp | 2 +- test/block_entry.cpp | 2 +- test/block_pool.cpp | 2 +- test/branch.cpp | 2 +- test/main.cpp | 2 +- test/transaction_entry.cpp | 2 +- test/transaction_pool.cpp | 2 +- test/validate_block.cpp | 2 +- test/validate_transaction.cpp | 2 +- tools/initchain/initchain.cpp | 2 +- 70 files changed, 70 insertions(+), 70 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12b8119f..bea94f1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-blockchain developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-blockchain developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/Makefile.am b/Makefile.am index e54d14f0..684d7a0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-blockchain developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-blockchain developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/autogen.sh b/autogen.sh index 4069adc0..6532123d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-blockchain developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-blockchain developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/build.cmd b/build.cmd index 4011146c..4048f6c2 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ REM ########################################################################### -REM # Copyright (c) 2014-2020 libbitcoin-blockchain developers (see COPYING). +REM # Copyright (c) 2014-2023 libbitcoin-blockchain developers (see COPYING). REM # REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY REM # diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index f787ef18..80aeee08 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-blockchain developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-blockchain developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/cmake/modules/FindBitcoin-Consensus.cmake b/builds/cmake/modules/FindBitcoin-Consensus.cmake index 8867ae8d..ed50996f 100644 --- a/builds/cmake/modules/FindBitcoin-Consensus.cmake +++ b/builds/cmake/modules/FindBitcoin-Consensus.cmake @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-blockchain developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-blockchain developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/cmake/modules/FindBitcoin-Database.cmake b/builds/cmake/modules/FindBitcoin-Database.cmake index 5315b2bd..faf75c28 100644 --- a/builds/cmake/modules/FindBitcoin-Database.cmake +++ b/builds/cmake/modules/FindBitcoin-Database.cmake @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-blockchain developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-blockchain developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/msvc/debug.natvis b/builds/msvc/debug.natvis index adf68148..c8739e49 100644 --- a/builds/msvc/debug.natvis +++ b/builds/msvc/debug.natvis @@ -1,6 +1,6 @@