diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd0b6568..0d914fe3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,13 +20,13 @@ jobs: - os: ubuntu-22.04 cxx: "clang++-15" link: "dynamic" - optimization: "debug" + optimization: "size" assert: "debug" coverage: "nocov" boost: "--build-boost" icu: "" cc: "clang-15" - flags: "-Og -fPIE" + flags: "-Os -fPIE" options: "--enable-isystem" packager: "apt" packages: "" @@ -62,13 +62,13 @@ jobs: - os: ubuntu-22.04 cxx: "g++-11" link: "static" - optimization: "size" + optimization: "debug" assert: "ndebug" coverage: "cov" boost: "--build-boost" icu: "--build-icu --with-icu" cc: "gcc-11" - flags: "-Os -g --coverage -fPIE" + flags: "-Og -g --coverage -fPIE" options: "--enable-isystem" packager: "apt" packages: "lcov" @@ -113,7 +113,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Prepare toolchain [generic] run: | @@ -134,7 +134,7 @@ jobs: shell: bash run: | WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-database}" - echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV + echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV if [[ ${{ matrix.assert }} == 'ndebug' ]]; then echo "ASSERT_NDEBUG=--enable-ndebug" >> $GITHUB_ENV else @@ -146,7 +146,7 @@ jobs: echo "LINKAGE=--disable-shared" >> $GITHUB_ENV fi if [[ ${{ matrix.link }} == 'dynamic' ]]; then - echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV + echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV fi - name: Display Compiler details @@ -243,13 +243,13 @@ jobs: - os: ubuntu-22.04 cxx: "clang++-15" link: "dynamic" - optimization: "debug" + optimization: "size" assert: "debug" coverage: "nocov" boost: "--build-boost" icu: "" cc: "clang-15" - flags: "-Og -fPIE" + flags: "-Os -fPIE" options: "" packager: "apt" packages: "" @@ -285,13 +285,13 @@ jobs: - os: ubuntu-22.04 cxx: "g++-11" link: "static" - optimization: "size" + optimization: "debug" assert: "ndebug" coverage: "nocov" boost: "--build-boost" icu: "--build-icu --with-icu" cc: "gcc-11" - flags: "-Os -fPIE" + flags: "-Og -fPIE" options: "" packager: "apt" packages: "" @@ -336,7 +336,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Prepare toolchain [generic] run: | @@ -357,7 +357,7 @@ jobs: shell: bash run: | WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-database}" - echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV + echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV if [[ ${{ matrix.packager }} == 'brew' ]]; then echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV fi @@ -372,7 +372,7 @@ jobs: echo "LINKAGE=--disable-shared" >> $GITHUB_ENV fi if [[ ${{ matrix.link }} == 'dynamic' ]]; then - echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/lib" >> $GITHUB_ENV + echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV fi - name: Display Compiler details @@ -480,13 +480,13 @@ jobs: preset: "nix-gnu-debug-shared" cxx: "clang++-15" link: "dynamic" - optimization: "debug" + optimization: "size" assert: "debug" coverage: "nocov" boost: "--build-boost" icu: "" cc: "clang-15" - flags: "-Og -fPIE" + flags: "-Os -fPIE" options: "" packager: "apt" packages: "" @@ -533,7 +533,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Prepare toolchain [generic] run: | @@ -554,7 +554,7 @@ jobs: shell: bash run: | WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-database}" - echo "LIBBITCOIN_SRC_PATH=${WORKSPACE_SUBPATH}" >> $GITHUB_ENV + echo "LIBBITCOIN_SRC_PATH=$WORKSPACE_SUBPATH" >> $GITHUB_ENV if [[ ${{ matrix.packager }} == 'brew' ]]; then echo "CMAKE_LIBRARY_PATH=/usr/local/lib" >> $GITHUB_ENV fi @@ -569,7 +569,7 @@ jobs: echo "LINKAGE=--disable-shared" >> $GITHUB_ENV fi if [[ ${{ matrix.link }} == 'dynamic' ]]; then - echo "LDFLAGS=-Wl,-rpath,${WORKSPACE_SUBPATH}prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV + echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV fi - name: Display Compiler details @@ -694,7 +694,7 @@ jobs: msbuild-architecture: x64 - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v3 - name: Initialize SDK shell: powershell diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index 833034d7..635b049c 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -7,7 +7,7 @@ # libbitcoin-database project configuration. #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 3.18 FATAL_ERROR) +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(libbitcoin-database LANGUAGES C CXX) @@ -18,7 +18,6 @@ include(CheckIncludeFiles) include(CheckSymbolExists) include(CheckCXXCompilerFlag) include(CheckCXXSourceCompiles) -include(CheckLinkerFlag) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -147,7 +146,11 @@ find_package( Boost 1.76.0 REQUIRED COMPONENTS set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" ) -set( Boost_LIBRARY_DIR $,"${Boost_LIBRARY_DIR_RELEASE}","${Boost_LIBRARY_DIR_DEBUG}">) +if (enable-ndebug) + set( Boost_LIBRARY_DIR "${Boost_LIBRARY_DIR_DEBUG}" ) +else () + set( Boost_LIBRARY_DIR "${Boost_LIBRARY_DIR_RELEASE}" ) +endif() set( boost_CPPFLAGS "-I${Boost_INCLUDE_DIR}" ) set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" ) @@ -156,66 +159,40 @@ set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" ) #------------------------------------------------------------------------------ find_package( Bitcoin-System 4.0.0 REQUIRED ) -# Define project common includes for build. -#------------------------------------------------------------------------------ -if (BUILD_SHARED_LIBS) - set( bitcoin_system_FOR_BUILD_INCLUDE_DIRS ${bitcoin_system_INCLUDE_DIRS} CACHE STRING "Placeholder" ) -else() - set( bitcoin_system_FOR_BUILD_INCLUDE_DIRS ${bitcoin_system_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" ) -endif() - # Define project common includes directories #------------------------------------------------------------------------------ -include_directories( SYSTEM - ${bitcoin_system_FOR_BUILD_INCLUDE_DIRS} ) - -# Define project common library directories for build. -#------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - set( bitcoin_system_FOR_BUILD_LIBRARY_DIRS ${bitcoin_system_LIBRARY_DIRS} CACHE STRING "Placeholder" ) + include_directories( SYSTEM + ${bitcoin_system_INCLUDE_DIRS} ) else() - set( bitcoin_system_FOR_BUILD_LIBRARY_DIRS ${bitcoin_system_STATIC_LIBRARY_DIRS} CACHE STRING "Placeholder" ) + include_directories( SYSTEM + ${bitcoin_system_STATIC_INCLUDE_DIRS} ) endif() # Define project common library directories #------------------------------------------------------------------------------ -link_directories( - ${bitcoin_system_FOR_BUILD_LIBRARY_DIRS} ) - -# Define project common linker flags. -#------------------------------------------------------------------------------ -check_linker_flag(CXX "-no_fixup_chains" "no_fixup_chains_FOUND") - -if (no_fixup_chains_FOUND) - add_link_options("-no_fixup_chains") -endif() - -check_linker_flag(CXX "-fstack-protector" "fstack_protector_FOUND") - -if (fstack_protector_FOUND) - add_link_options("-fstack-protector") -endif() - -check_linker_flag(CXX "-fstack-protector-all" "fstack_protector_all_FOUND") - -if (fstack_protector_all_FOUND) - add_link_options("-fstack-protector-all") +if (BUILD_SHARED_LIBS) + link_directories( + ${bitcoin_system_LIBRARY_DIRS} ) +else() + link_directories( + ${bitcoin_system_STATIC_LIBRARY_DIRS} ) endif() - -# Define common library usage for build. +# Define project common libraries/linker flags. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - set( bitcoin_system_FOR_BUILD_LIBRARIES ${bitcoin_system_LIBRARIES} CACHE STRING "Placeholder" ) + link_libraries( + "-fstack-protector" + "-fstack-protector-all" + ${bitcoin_system_LIBRARIES} ) else() - set( bitcoin_system_FOR_BUILD_LIBRARIES ${bitcoin_system_STATIC_LIBRARIES} CACHE STRING "Placeholder" ) + link_libraries( + "-fstack-protector" + "-fstack-protector-all" + ${bitcoin_system_STATIC_LIBRARIES} ) endif() -# Define project common libraries. -#------------------------------------------------------------------------------ -link_libraries( - ${bitcoin_system_FOR_BUILD_LIBRARIES} ) - # Define ${CANONICAL_LIB_NAME} project. #------------------------------------------------------------------------------ add_library( ${CANONICAL_LIB_NAME} @@ -230,36 +207,31 @@ add_library( ${CANONICAL_LIB_NAME} "../../src/memory/mman-win32/mman.c" "../../src/memory/mman-win32/mman.h" ) -# ${CANONICAL_LIB_NAME} project specific include directory normalization for build. +# ${CANONICAL_LIB_NAME} project specific include directories. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - set( bitcoin_system_FOR_BUILD_INCLUDE_DIRS ${bitcoin_system_INCLUDE_DIRS} CACHE STRING "Placeholder" ) + target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE + "../../include" + ${bitcoin_system_INCLUDE_DIRS} ) else() - set( bitcoin_system_FOR_BUILD_INCLUDE_DIRS ${bitcoin_system_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" ) + target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE + "../../include" + ${bitcoin_system_STATIC_INCLUDE_DIRS} ) endif() -# ${CANONICAL_LIB_NAME} project specific include directories. -#------------------------------------------------------------------------------ -target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE - "../../include" - ${bitcoin_system_FOR_BUILD_INCLUDE_DIRS} ) - target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC "../../include" ) -# ${CANONICAL_LIB_NAME} project specific libraries noramalization for build. +# ${CANONICAL_LIB_NAME} project specific libraries/linker flags. #------------------------------------------------------------------------------ if (BUILD_SHARED_LIBS) - set( bitcoin_system_FOR_BUILD_LIBRARIES ${bitcoin_system_LIBRARIES} CACHE STRING "Placeholder" ) + target_link_libraries( ${CANONICAL_LIB_NAME} + ${bitcoin_system_LIBRARIES} ) else() - set( bitcoin_system_FOR_BUILD_LIBRARIES ${bitcoin_system_STATIC_LIBRARIES} CACHE STRING "Placeholder" ) + target_link_libraries( ${CANONICAL_LIB_NAME} + ${bitcoin_system_STATIC_LIBRARIES} ) endif() -# ${CANONICAL_LIB_NAME} project specific libraries/linker flags. -#------------------------------------------------------------------------------ -target_link_libraries( ${CANONICAL_LIB_NAME} - ${bitcoin_system_FOR_BUILD_LIBRARIES} ) - # Define libbitcoin-database-test project. #------------------------------------------------------------------------------ if (with-tests) diff --git a/configure.ac b/configure.ac index 1ddb4cb8..502db330 100644 --- a/configure.ac +++ b/configure.ac @@ -203,12 +203,6 @@ AS_CASE([${CC}], [*clang*], [AX_CHECK_COMPILE_FLAG([-Wno-mismatched-tags], [CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"])]) -# Address -undefined dynamic_lookup MacOS error. -#------------------------------------------------------------------------------ -AS_CASE([${CC}], [*], - [AX_CHECK_LINK_FLAG([-no_fixup_chains], - [LDFLAGS="$LDFLAGS -no_fixup_chains"])]) - # Protect stack. #------------------------------------------------------------------------------ AS_CASE([${CC}], [*],