Skip to content

Commit

Permalink
Regenerate artifacts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@evoskuil
evoskuil committed Feb 11, 2024
1 parent c53b3d9 commit 4bdc1ff
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 93 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
View file
Expand Up @@ -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: ""
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3

- name: Prepare toolchain [generic]
run: |
Expand All @@ -134,7 +134,7 @@ jobs:
shell: bash
run: |
WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-consensus}"
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
Expand All @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down Expand Up @@ -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: ""
Expand Down Expand Up @@ -336,7 +336,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3

- name: Prepare toolchain [generic]
run: |
Expand All @@ -357,7 +357,7 @@ jobs:
shell: bash
run: |
WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-consensus}"
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
Expand All @@ -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
Expand Down Expand Up @@ -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: ""
Expand Down Expand Up @@ -533,7 +533,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3

- name: Prepare toolchain [generic]
run: |
Expand All @@ -554,7 +554,7 @@ jobs:
shell: bash
run: |
WORKSPACE_SUBPATH="${GITHUB_WORKSPACE%libbitcoin-consensus}"
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
Expand All @@ -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
Expand Down Expand Up @@ -706,7 +706,7 @@ jobs:
msbuild-architecture: x64

- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3

- name: Initialize SDK
shell: powershell
Expand Down
108 changes: 41 additions & 67 deletions builds/cmake/CMakeLists.txt
View file
Expand Up @@ -7,7 +7,7 @@

# libbitcoin-consensus project configuration.
#------------------------------------------------------------------------------
cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)

project(libbitcoin-consensus LANGUAGES C CXX)

Expand All @@ -18,7 +18,6 @@ include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles)
include(CheckLinkerFlag)

set_property(GLOBAL PROPERTY USE_FOLDERS ON)

Expand Down Expand Up @@ -479,7 +478,11 @@ find_package( Boost 1.76.0 REQUIRED COMPONENTS

set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )

set( Boost_LIBRARY_DIR $<IF:$<BOOL:${enable-ndebug}>,"${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}" )
Expand All @@ -488,66 +491,40 @@ set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" )
#------------------------------------------------------------------------------
find_package( Secp256K1 0.1.0.20 REQUIRED )

# Define project common includes for build.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( secp256k1_FOR_BUILD_INCLUDE_DIRS ${secp256k1_INCLUDE_DIRS} CACHE STRING "Placeholder" )
else()
set( secp256k1_FOR_BUILD_INCLUDE_DIRS ${secp256k1_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" )
endif()

# Define project common includes directories
#------------------------------------------------------------------------------
include_directories( SYSTEM
${secp256k1_FOR_BUILD_INCLUDE_DIRS} )

# Define project common library directories for build.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( secp256k1_FOR_BUILD_LIBRARY_DIRS ${secp256k1_LIBRARY_DIRS} CACHE STRING "Placeholder" )
include_directories( SYSTEM
${secp256k1_INCLUDE_DIRS} )
else()
set( secp256k1_FOR_BUILD_LIBRARY_DIRS ${secp256k1_STATIC_LIBRARY_DIRS} CACHE STRING "Placeholder" )
include_directories( SYSTEM
${secp256k1_STATIC_INCLUDE_DIRS} )
endif()

# Define project common library directories
#------------------------------------------------------------------------------
link_directories(
${secp256k1_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(
${secp256k1_LIBRARY_DIRS} )
else()
link_directories(
${secp256k1_STATIC_LIBRARY_DIRS} )
endif()


# Define common library usage for build.
# Define project common libraries/linker flags.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( secp256k1_FOR_BUILD_LIBRARIES ${secp256k1_LIBRARIES} CACHE STRING "Placeholder" )
link_libraries(
"-fstack-protector"
"-fstack-protector-all"
${secp256k1_LIBRARIES} )
else()
set( secp256k1_FOR_BUILD_LIBRARIES ${secp256k1_STATIC_LIBRARIES} CACHE STRING "Placeholder" )
link_libraries(
"-fstack-protector"
"-fstack-protector-all"
${secp256k1_STATIC_LIBRARIES} )
endif()

# Define project common libraries.
#------------------------------------------------------------------------------
link_libraries(
${secp256k1_FOR_BUILD_LIBRARIES} )

# Define ${CANONICAL_LIB_NAME} project.
#------------------------------------------------------------------------------
add_library( ${CANONICAL_LIB_NAME}
Expand Down Expand Up @@ -591,38 +568,35 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/consensus/consensus.cpp"
"../../src/consensus/consensus.hpp" )

# ${CANONICAL_LIB_NAME} project specific include directory normalization for build.
# ${CANONICAL_LIB_NAME} project specific include directories.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( secp256k1_FOR_BUILD_INCLUDE_DIRS ${secp256k1_INCLUDE_DIRS} CACHE STRING "Placeholder" )
target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
"../../include"
"../../src"
"../../src/clone"
${secp256k1_INCLUDE_DIRS} )
else()
set( secp256k1_FOR_BUILD_INCLUDE_DIRS ${secp256k1_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" )
target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
"../../include"
"../../src"
"../../src/clone"
${secp256k1_STATIC_INCLUDE_DIRS} )
endif()

# ${CANONICAL_LIB_NAME} project specific include directories.
#------------------------------------------------------------------------------
target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
"../../include"
"../../src"
"../../src/clone"
${secp256k1_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( secp256k1_FOR_BUILD_LIBRARIES ${secp256k1_LIBRARIES} CACHE STRING "Placeholder" )
target_link_libraries( ${CANONICAL_LIB_NAME}
${secp256k1_LIBRARIES} )
else()
set( secp256k1_FOR_BUILD_LIBRARIES ${secp256k1_STATIC_LIBRARIES} CACHE STRING "Placeholder" )
target_link_libraries( ${CANONICAL_LIB_NAME}
${secp256k1_STATIC_LIBRARIES} )
endif()

# ${CANONICAL_LIB_NAME} project specific libraries/linker flags.
#------------------------------------------------------------------------------
target_link_libraries( ${CANONICAL_LIB_NAME}
${secp256k1_FOR_BUILD_LIBRARIES} )

# Define libbitcoin-consensus-test project.
#------------------------------------------------------------------------------
if (with-tests)
Expand Down
6 changes: 0 additions & 6 deletions configure.ac
View file
Expand Up @@ -411,12 +411,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}], [*],
Expand Down

0 comments on commit 4bdc1ff

Please sign in to comment.