Skip to content

Commit ea388de

Browse files
pmienkpmienk
committed
Regenerate artifacts.
1 parent aa1172e commit ea388de

File tree

4 files changed

+23
-29
lines changed

4 files changed

+23
-29
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207
208208
- name: Execute install.sh
209209
run: >
210-
CXXFLAGS="${CXXFLAGS} -I${{ env.LIBBITCOIN_SRC_PATH }}prefix/include/bitcoin/ssl" ./install.sh
210+
./install.sh
211211
--build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
212212
--prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
213213
${{ env.LINKAGE }}
@@ -481,7 +481,7 @@ jobs:
481481
482482
- name: Execute install-cmake.sh
483483
run: >
484-
CXXFLAGS="${CXXFLAGS} -I${{ env.LIBBITCOIN_SRC_PATH }}prefix/include/bitcoin/ssl" ./install-cmake.sh
484+
./install-cmake.sh
485485
--build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
486486
--prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
487487
${{ env.LINKAGE }}
@@ -717,7 +717,7 @@ jobs:
717717
718718
- name: Execute install-cmakepresets.sh
719719
run: >
720-
CXXFLAGS="${CXXFLAGS} -I${{ env.LIBBITCOIN_SRC_PATH }}prefix/include/bitcoin/ssl" ./install-cmakepresets.sh
720+
./install-cmakepresets.sh
721721
--build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
722722
--prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }}
723723
--preset=${{ matrix.preset }}

‎builds/msvc/vs2022/libbitcoin-node-test/libbitcoin-node-test.vcxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@
137137
<ClCompile Include="..\..\..\..\test\protocols\protocol.cpp" />
138138
<ClCompile Include="..\..\..\..\test\sessions\session.cpp" />
139139
<ClCompile Include="..\..\..\..\test\settings.cpp" />
140-
<ClCompile Include="..\..\..\..\test\test.cpp" />
140+
<ClCompile Include="..\..\..\..\test\test.cpp">
141+
<ObjectFileName>$(IntDir)test_test.obj</ObjectFileName>
142+
</ClCompile>
141143
</ItemGroup>
142144
<ItemGroup>
143145
<ClInclude Include="..\..\..\..\test\test.hpp" />

‎configure.ac‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -263,18 +263,15 @@ AS_CASE([${with_tests}], [yes],
263263
# Require bash-completion of at least version 2.0.0 and output ${bash_completion_CPPFLAGS/LIBS/PKG}.
264264
#------------------------------------------------------------------------------
265265
AS_CASE([${bash_completiondir}], [yes],
266-
[PKG_CHECK_MODULES([bash_completion], [bash-completion >= 2.0.0],
267-
[bash_completion_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "bash-completion >= 2.0.0" 2>/dev/null`"
268-
bash_completion_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "bash-completion >= 2.0.0" 2>/dev/null`"
269-
bash_completiondir="`$PKG_CONFIG --variable=completionsdir "bash-completion >= 2.0.0" 2>/dev/null`"],
270-
[bash_completion_INCLUDEDIR=""
271-
bash_completion_OTHER_CFLAGS=""
272-
bash_completiondir="${datadir}/bash-completion/completions"])
266+
[PKG_CHECK_MODULES([bash_completion], [bash-completion >= 2.0.0], [],
267+
[
268+
bash_completion_INCLUDEDIR=""
269+
bash_completion_OTHER_CFLAGS=""
270+
bash_completiondir="${datadir}/bash-completion/completions"
271+
])
273272
AC_SUBST([bash_completion_PKG], ['bash-completion >= 2.0.0'])
274273
AC_SUBST([bash_completion_CPPFLAGS], [${bash_completion_CFLAGS}])
275-
AS_IF([test x${bash_completion_INCLUDEDIR} != "x"],
276-
[AC_SUBST([bash_completion_ISYS_CPPFLAGS], ["-isystem${bash_completion_INCLUDEDIR} ${bash_completion_OTHER_CFLAGS}"])],
277-
[AC_SUBST([bash_completion_ISYS_CPPFLAGS], [${bash_completion_OTHER_CFLAGS}])])
274+
AC_SUBST([bash_completion_ISYS_CPPFLAGS], [`echo ${bash_completion_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
278275
AC_MSG_NOTICE([bash_completion_CPPFLAGS : ${bash_completion_CPPFLAGS}])
279276
AC_MSG_NOTICE([bash_completion_ISYS_CPPFLAGS : ${bash_completion_ISYS_CPPFLAGS}])
280277
AC_MSG_NOTICE([bash_completion_OTHER_CFLAGS : ${bash_completion_OTHER_CFLAGS}])
@@ -290,15 +287,13 @@ AC_MSG_NOTICE([bash_completion_BUILD_CPPFLAGS : ${bash_completion_BUILD_CPPFLAGS
290287

291288
# Require bitcoin-database of at least version 4.0.0 and output ${bitcoin_database_CPPFLAGS/LIBS/PKG}.
292289
#------------------------------------------------------------------------------
293-
PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 4.0.0],
294-
[bitcoin_database_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-database >= 4.0.0" 2>/dev/null`"
295-
bitcoin_database_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-database >= 4.0.0" 2>/dev/null`"],
296-
[AC_MSG_ERROR([libbitcoin-database >= 4.0.0 is required but was not found.])])
290+
PKG_CHECK_MODULES([bitcoin_database], [libbitcoin-database >= 4.0.0], [],
291+
[
292+
AC_MSG_ERROR([libbitcoin-database >= 4.0.0 is required but was not found.])
293+
])
297294
AC_SUBST([bitcoin_database_PKG], ['libbitcoin-database >= 4.0.0'])
298295
AC_SUBST([bitcoin_database_CPPFLAGS], [${bitcoin_database_CFLAGS}])
299-
AS_IF([test x${bitcoin_database_INCLUDEDIR} != "x"],
300-
[AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], ["-isystem${bitcoin_database_INCLUDEDIR} ${bitcoin_database_OTHER_CFLAGS}"])],
301-
[AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], [${bitcoin_database_OTHER_CFLAGS}])])
296+
AC_SUBST([bitcoin_database_ISYS_CPPFLAGS], [`echo ${bitcoin_database_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
302297
AC_MSG_NOTICE([bitcoin_database_CPPFLAGS : ${bitcoin_database_CPPFLAGS}])
303298
AC_MSG_NOTICE([bitcoin_database_ISYS_CPPFLAGS : ${bitcoin_database_ISYS_CPPFLAGS}])
304299
AC_MSG_NOTICE([bitcoin_database_OTHER_CFLAGS : ${bitcoin_database_OTHER_CFLAGS}])
@@ -313,15 +308,13 @@ AC_MSG_NOTICE([bitcoin_database_BUILD_CPPFLAGS : ${bitcoin_database_BUILD_CPPFLA
313308

314309
# Require bitcoin-network of at least version 4.0.0 and output ${bitcoin_network_CPPFLAGS/LIBS/PKG}.
315310
#------------------------------------------------------------------------------
316-
PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 4.0.0],
317-
[bitcoin_network_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-network >= 4.0.0" 2>/dev/null`"
318-
bitcoin_network_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-network >= 4.0.0" 2>/dev/null`"],
319-
[AC_MSG_ERROR([libbitcoin-network >= 4.0.0 is required but was not found.])])
311+
PKG_CHECK_MODULES([bitcoin_network], [libbitcoin-network >= 4.0.0], [],
312+
[
313+
AC_MSG_ERROR([libbitcoin-network >= 4.0.0 is required but was not found.])
314+
])
320315
AC_SUBST([bitcoin_network_PKG], ['libbitcoin-network >= 4.0.0'])
321316
AC_SUBST([bitcoin_network_CPPFLAGS], [${bitcoin_network_CFLAGS}])
322-
AS_IF([test x${bitcoin_network_INCLUDEDIR} != "x"],
323-
[AC_SUBST([bitcoin_network_ISYS_CPPFLAGS], ["-isystem${bitcoin_network_INCLUDEDIR} ${bitcoin_network_OTHER_CFLAGS}"])],
324-
[AC_SUBST([bitcoin_network_ISYS_CPPFLAGS], [${bitcoin_network_OTHER_CFLAGS}])])
317+
AC_SUBST([bitcoin_network_ISYS_CPPFLAGS], [`echo ${bitcoin_network_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
325318
AC_MSG_NOTICE([bitcoin_network_CPPFLAGS : ${bitcoin_network_CPPFLAGS}])
326319
AC_MSG_NOTICE([bitcoin_network_ISYS_CPPFLAGS : ${bitcoin_network_ISYS_CPPFLAGS}])
327320
AC_MSG_NOTICE([bitcoin_network_OTHER_CFLAGS : ${bitcoin_network_OTHER_CFLAGS}])

‎libbitcoin-node.pc.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ exec_prefix=@exec_prefix@
1212
libdir=@libdir@
1313
includedir=@includedir@
1414

15-
1615
# Metadata
1716
#==============================================================================
1817
Name: libbitcoin-node

0 commit comments

Comments
 (0)