Skip to content

Commit a11a9fd

Browse files
pmienkpmienk
authored
Merge pull request #1788 from pmienk/master
Update ICU to version 78.2 (installation, not minimum supported versi…
2 parents 38050ca + 732db8d commit a11a9fd

8 files changed

Lines changed: 41 additions & 123 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
coverage: "nocov"
9494
detectcpuflags: "ignore"
9595
boost: "--build-boost"
96-
icu: ""
96+
icu: "--with-icu"
9797
llvm: ""
9898
secp256k1: "--build-secp256k1"
9999
cc: "clang"
@@ -110,14 +110,14 @@ jobs:
110110
coverage: "nocov"
111111
detectcpuflags: "ignore"
112112
boost: "--build-boost"
113-
icu: ""
113+
icu: "--build-icu --with-icu"
114114
llvm: ""
115115
secp256k1: "--build-secp256k1"
116116
cc: "clang"
117117
flags: "-Os -fvisibility=hidden -fPIE"
118118
options: "--enable-isystem"
119119
packager: "brew"
120-
packages: "icu4c"
120+
packages: ""
121121

122122

123123
runs-on: ${{ matrix.os }}
@@ -364,7 +364,7 @@ jobs:
364364
coverage: "nocov"
365365
detectcpuflags: "ignore"
366366
boost: "--build-boost"
367-
icu: ""
367+
icu: "--with-icu"
368368
llvm: ""
369369
secp256k1: "--build-secp256k1"
370370
cc: "clang"
@@ -381,14 +381,14 @@ jobs:
381381
coverage: "nocov"
382382
detectcpuflags: "ignore"
383383
boost: "--build-boost"
384-
icu: ""
384+
icu: "--build-icu --with-icu"
385385
llvm: ""
386386
secp256k1: "--build-secp256k1"
387387
cc: "clang"
388388
flags: "-Os -fvisibility=hidden -fPIE"
389389
options: ""
390390
packager: "brew"
391-
packages: "icu4c"
391+
packages: ""
392392

393393

394394
runs-on: ${{ matrix.os }}

‎Makefile.am‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ doc_DATA = \
3232
# src/libbitcoin-system.la => ${libdir}
3333
#------------------------------------------------------------------------------
3434
lib_LTLIBRARIES = src/libbitcoin-system.la
35-
src_libbitcoin_system_la_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
35+
src_libbitcoin_system_la_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
3636
src_libbitcoin_system_la_LDFLAGS = ${boost_LDFLAGS}
37-
src_libbitcoin_system_la_LIBADD = ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_program_options_LIBS} ${boost_thread_LIBS} ${boost_url_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${secp256k1_LIBS}
37+
src_libbitcoin_system_la_LIBADD = ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_program_options_LIBS} ${boost_thread_LIBS} ${boost_url_LIBS} ${icu_i18n_LIBS} ${secp256k1_LIBS}
3838
src_libbitcoin_system_la_SOURCES = \
3939
src/arena.cpp \
4040
src/define.cpp \
@@ -193,9 +193,9 @@ src_libbitcoin_system_la_SOURCES = \
193193
if WITH_EXAMPLES
194194

195195
noinst_PROGRAMS = examples/libbitcoin-system-examples
196-
examples_libbitcoin_system_examples_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
196+
examples_libbitcoin_system_examples_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
197197
examples_libbitcoin_system_examples_LDFLAGS = ${boost_LDFLAGS}
198-
examples_libbitcoin_system_examples_LDADD = src/libbitcoin-system.la ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_program_options_LIBS} ${boost_thread_LIBS} ${boost_url_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${secp256k1_LIBS}
198+
examples_libbitcoin_system_examples_LDADD = src/libbitcoin-system.la ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_program_options_LIBS} ${boost_thread_LIBS} ${boost_url_LIBS} ${icu_i18n_LIBS} ${secp256k1_LIBS}
199199
examples_libbitcoin_system_examples_SOURCES = \
200200
examples/main.cpp
201201

@@ -208,9 +208,9 @@ if WITH_TESTS
208208
TESTS = libbitcoin-system-test_runner.sh
209209

210210
check_PROGRAMS = test/libbitcoin-system-test
211-
test_libbitcoin_system_test_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${pthread_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
211+
test_libbitcoin_system_test_CPPFLAGS = -I${srcdir}/include ${icu} ${boost_BUILD_CPPFLAGS} ${icu_i18n_BUILD_CPPFLAGS} ${secp256k1_BUILD_CPPFLAGS}
212212
test_libbitcoin_system_test_LDFLAGS = ${boost_LDFLAGS}
213-
test_libbitcoin_system_test_LDADD = src/libbitcoin-system.la ${boost_unit_test_framework_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_program_options_LIBS} ${boost_thread_LIBS} ${boost_url_LIBS} ${pthread_LIBS} ${rt_LIBS} ${icu_i18n_LIBS} ${dl_LIBS} ${secp256k1_LIBS}
213+
test_libbitcoin_system_test_LDADD = src/libbitcoin-system.la ${boost_unit_test_framework_LIBS} ${boost_iostreams_LIBS} ${boost_locale_LIBS} ${boost_program_options_LIBS} ${boost_thread_LIBS} ${boost_url_LIBS} ${icu_i18n_LIBS} ${secp256k1_LIBS}
214214
test_libbitcoin_system_test_SOURCES = \
215215
test/allocator.cpp \
216216
test/arena.cpp \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -340,40 +340,12 @@ set( Boost_LIBRARY_DIR $<IF:$<BOOL:${enable-ndebug}>,"${Boost_LIBRARY_DIR_RELEAS
340340
set( boost_CPPFLAGS "-I${Boost_INCLUDE_DIR}" )
341341
set( boost_LDFLAGS "-L${Boost_LIBRARY_DIR}" )
342342

343-
set( CMAKE_THREAD_PREFER_PTHREAD ON )
344-
set( THREADS_PREFER_PTHREAD_FLAG ON )
345-
346-
# Find threads
347-
#------------------------------------------------------------------------------
348-
if (NOT ANDROID)
349-
find_package( Threads REQUIRED )
350-
endif()
351-
352-
if ( Threads_FOUND AND NOT ANDROID )
353-
# TODO: find proper detection - documentation on FindThreads appears incorrect.
354-
set( pthread_CPPFLAGS "" )
355-
set( pthread_LIBRARIES "-lpthread" )
356-
set( pthread_LIBS "-lpthread" )
357-
endif()
358-
359-
# Find rt
360-
#------------------------------------------------------------------------------
361-
if ((${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND NOT ANDROID)
362-
find_package( Rt REQUIRED )
363-
endif()
364-
365343
# Find icu-i18n
366344
#------------------------------------------------------------------------------
367345
if (with-icu)
368346
find_package( Icu-I18N 55.2 REQUIRED )
369347
endif()
370348

371-
# Find dl
372-
#------------------------------------------------------------------------------
373-
if ((${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
374-
find_package( Dl REQUIRED )
375-
endif()
376-
377349
# Find secp256k1
378350
#------------------------------------------------------------------------------
379351
find_package( Secp256K1 0.5.1.0 REQUIRED )
@@ -392,10 +364,7 @@ endif()
392364
#------------------------------------------------------------------------------
393365
include_directories( SYSTEM
394366
${Boost_INCLUDE_DIR}
395-
${pthread_INCLUDE_DIRS}
396-
${rt_INCLUDE_DIRS}
397367
${icu_i18n_FOR_BUILD_INCLUDE_DIRS}
398-
${dl_INCLUDE_DIRS}
399368
${secp256k1_FOR_BUILD_INCLUDE_DIRS} )
400369

401370
# Define project common library directories for build.
@@ -412,10 +381,7 @@ endif()
412381
#------------------------------------------------------------------------------
413382
link_directories(
414383
${Boost_LIBRARY_DIRS}
415-
${pthread_LIBRARY_DIRS}
416-
${rt_LIBRARY_DIRS}
417384
${icu_i18n_FOR_BUILD_LIBRARY_DIRS}
418-
${dl_LIBRARY_DIRS}
419385
${secp256k1_FOR_BUILD_LIBRARY_DIRS} )
420386

421387
# Define project common linker flags.
@@ -457,10 +423,7 @@ link_libraries(
457423
${Boost_PROGRAM_OPTIONS_LIBRARY}
458424
${Boost_THREAD_LIBRARY}
459425
${Boost_URL_LIBRARY}
460-
${pthread_LIBRARIES}
461-
${rt_LIBRARIES}
462426
${icu_i18n_FOR_BUILD_LIBRARIES}
463-
${dl_LIBRARIES}
464427
${secp256k1_FOR_BUILD_LIBRARIES} )
465428

466429
add_definitions(
@@ -636,10 +599,7 @@ endif()
636599
target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
637600
"../../include"
638601
${Boost_INCLUDE_DIR}
639-
${pthread_INCLUDE_DIRS}
640-
${rt_INCLUDE_DIRS}
641602
${icu_i18n_FOR_BUILD_INCLUDE_DIRS}
642-
${dl_INCLUDE_DIRS}
643603
${secp256k1_FOR_BUILD_INCLUDE_DIRS} )
644604

645605
target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC
@@ -663,10 +623,7 @@ target_link_libraries( ${CANONICAL_LIB_NAME}
663623
${Boost_PROGRAM_OPTIONS_LIBRARY}
664624
${Boost_THREAD_LIBRARY}
665625
${Boost_URL_LIBRARY}
666-
${pthread_LIBRARIES}
667-
${rt_LIBRARIES}
668626
${icu_i18n_FOR_BUILD_LIBRARIES}
669-
${dl_LIBRARIES}
670627
${secp256k1_FOR_BUILD_LIBRARIES} )
671628

672629
# Define libbitcoin-system-examples project.

‎configure.ac‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -412,42 +412,6 @@ AS_CASE([${with_tests}], [yes],
412412
AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])],
413413
[AC_SUBST([boost_unit_test_framework_LIBS], [])])
414414

415-
# Require pthread if not on android and output ${pthread_CPPFLAGS/LIBS}.
416-
#------------------------------------------------------------------------------
417-
# Hard wired -lpthread because AX_PTHREAD does not do it.
418-
AS_CASE([${host_os}],
419-
[*android*],
420-
[AC_SUBST([pthread_LIBS], [])],
421-
[AX_PTHREAD(
422-
[AC_SUBST([pthread_CPPFLAGS], [${PTHREAD_CPPFLAGS}])
423-
AC_SUBST([pthread_ISYS_CPPFLAGS], [`echo ${PTHREAD_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`])
424-
AC_SUBST([pthread_LIBS], [-lpthread])
425-
AC_MSG_NOTICE([pthread_CPPFLAGS : ${pthread_CPPFLAGS}])
426-
AC_MSG_NOTICE([pthread_ISYS_CPPFLAGS : ${pthread_ISYS_CPPFLAGS}])],
427-
[AC_MSG_ERROR([pthread library is required but was not found.])])
428-
429-
AS_CASE([${enable_isystem}],[yes],
430-
[AC_SUBST([pthread_BUILD_CPPFLAGS], [${pthread_ISYS_CPPFLAGS}])],
431-
[AC_SUBST([pthread_BUILD_CPPFLAGS], [${pthread_CPPFLAGS}])])
432-
433-
AC_MSG_NOTICE([pthread_BUILD_CPPFLAGS : ${pthread_BUILD_CPPFLAGS}])])
434-
435-
AC_MSG_NOTICE([pthread_LIBS : ${pthread_LIBS}])
436-
437-
# Require rt if on linux if not on android and output ${rt_LIBS}.
438-
#------------------------------------------------------------------------------
439-
440-
AS_CASE([${host_os}],
441-
[*android*],
442-
[AC_SUBST([rt_LIBS], [])],
443-
[*linux*],
444-
[AC_CHECK_LIB([rt], [clock_gettime],
445-
[AC_SUBST([rt_LIBS], [-lrt])],
446-
[AC_MSG_ERROR([rt library is required but was not found.])])],
447-
[AC_SUBST([rt_LIBS], [])])
448-
449-
AC_MSG_NOTICE([rt_LIBS : ${rt_LIBS}])
450-
451415
# Require icu-i18n of at least version 55.2 and output ${icu_i18n_CPPFLAGS/LIBS/PKG}.
452416
#------------------------------------------------------------------------------
453417
AS_CASE([${with_icu}], [yes],
@@ -471,18 +435,6 @@ AS_CASE([${enable_isystem}],[yes],
471435

472436
AC_MSG_NOTICE([icu_i18n_BUILD_CPPFLAGS : ${icu_i18n_BUILD_CPPFLAGS}])
473437

474-
# Require dl if on linux and output ${dl_LIBS}.
475-
#------------------------------------------------------------------------------
476-
477-
AS_CASE([${host_os}],
478-
[*linux*],
479-
[AC_CHECK_LIB([dl], [dlopen],
480-
[AC_SUBST([dl_LIBS], [-ldl])],
481-
[AC_MSG_ERROR([dl library is required but was not found.])])],
482-
[AC_SUBST([dl_LIBS], [])])
483-
484-
AC_MSG_NOTICE([dl_LIBS : ${dl_LIBS}])
485-
486438
# Require secp256k1 of at least version 0.5.1.0 and output ${secp256k1_CPPFLAGS/LIBS/PKG}.
487439
#------------------------------------------------------------------------------
488440
PKG_CHECK_MODULES([secp256k1], [libsecp256k1 >= 0.5.1.0], [],

‎install-cmake.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)
6363

6464
# ICU archive.
6565
#------------------------------------------------------------------------------
66-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
67-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
66+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
67+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
6868

6969
# Boost archive.
7070
#------------------------------------------------------------------------------
@@ -494,11 +494,14 @@ initialize_icu_packages()
494494
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
495495
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
496496
# renaming or important features, so we can't use that.
497-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
497+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
498+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
498499
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
499500

500-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
501-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
501+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
502+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
503+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
504+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
502505
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
503506
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
504507
fi
@@ -880,7 +883,7 @@ build_from_tarball_boost()
880883
# "-sICU_LINK=${ICU_LIBS[*]}"
881884

882885
./b2 install \
883-
"cxxstd=11" \
886+
"cxxstd=20" \
884887
"variant=release" \
885888
"threading=multi" \
886889
"$BOOST_TOOLSET" \

‎install-cmakepresets.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)
6969

7070
# ICU archive.
7171
#------------------------------------------------------------------------------
72-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
73-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
72+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
73+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
7474

7575
# Boost archive.
7676
#------------------------------------------------------------------------------
@@ -534,11 +534,14 @@ initialize_icu_packages()
534534
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
535535
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
536536
# renaming or important features, so we can't use that.
537-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
537+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
538+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
538539
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
539540

540-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
541-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
541+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
542+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
543+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
544+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
542545
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
543546
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
544547
fi
@@ -923,7 +926,7 @@ build_from_tarball_boost()
923926
# "-sICU_LINK=${ICU_LIBS[*]}"
924927

925928
./b2 install \
926-
"cxxstd=11" \
929+
"cxxstd=20" \
927930
"variant=release" \
928931
"threading=multi" \
929932
"$BOOST_TOOLSET" \

‎install.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ PRESUMED_CI_PROJECT_PATH=$(pwd)
6363

6464
# ICU archive.
6565
#------------------------------------------------------------------------------
66-
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-55-2/icu4c-55_2-src.tgz"
67-
ICU_ARCHIVE="icu4c-55_2-src.tgz"
66+
ICU_URL="https://github.com/unicode-org/icu/releases/download/release-78.2/icu4c-78.2-sources.tgz"
67+
ICU_ARCHIVE="icu4c-78.2-sources.tgz"
6868

6969
# Boost archive.
7070
#------------------------------------------------------------------------------
@@ -437,11 +437,14 @@ initialize_icu_packages()
437437
# Update PKG_CONFIG_PATH for ICU package installations on OSX.
438438
# OSX provides libicucore.dylib with no pkgconfig and doesn't support
439439
# renaming or important features, so we can't use that.
440-
local HOMEBREW_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
440+
local HOMEBREW_USR_ICU_PKG_CONFIG="/usr/local/opt/icu4c/lib/pkgconfig"
441+
local HOMEBREW_OPT_ICU_PKG_CONFIG="/opt/homebrew/opt/icu4c/lib/pkgconfig"
441442
local MACPORTS_ICU_PKG_CONFIG="/opt/local/lib/pkgconfig"
442443

443-
if [[ -d "$HOMEBREW_ICU_PKG_CONFIG" ]]; then
444-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_ICU_PKG_CONFIG"
444+
if [[ -d "$HOMEBREW_USR_ICU_PKG_CONFIG" ]]; then
445+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_USR_ICU_PKG_CONFIG"
446+
elif [[ -d "$HOMEBREW_OPT_ICU_PKG_CONFIG" ]]; then
447+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_OPT_ICU_PKG_CONFIG"
445448
elif [[ -d "$MACPORTS_ICU_PKG_CONFIG" ]]; then
446449
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$MACPORTS_ICU_PKG_CONFIG"
447450
fi
@@ -755,7 +758,7 @@ build_from_tarball_boost()
755758
# "-sICU_LINK=${ICU_LIBS[*]}"
756759

757760
./b2 install \
758-
"cxxstd=11" \
761+
"cxxstd=20" \
759762
"variant=release" \
760763
"threading=multi" \
761764
"$BOOST_TOOLSET" \

‎libbitcoin-system.pc.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Requires: @icu_i18n_PKG@ libsecp256k1 >= 0.5.1.0
2828

2929
# Include directory and any other required compiler flags.
3030
#------------------------------------------------------------------------------
31-
Cflags: -I${includedir} @icu@ @avx2@ @avx512@ @shani@ @sse41@ @boost_CPPFLAGS@ @pthread_CPPFLAGS@
31+
Cflags: -I${includedir} @icu@ @avx2@ @avx512@ @shani@ @sse41@ @boost_CPPFLAGS@
3232

3333
# Lib directory, lib and any required that do not publish pkg-config.
3434
#------------------------------------------------------------------------------
35-
Libs: -L${libdir} -lbitcoin-system @boost_LDFLAGS@ @boost_iostreams_LIBS@ @boost_locale_LIBS@ @boost_program_options_LIBS@ @boost_thread_LIBS@ @boost_url_LIBS@ @pthread_LIBS@ @rt_LIBS@ @dl_LIBS@
35+
Libs: -L${libdir} -lbitcoin-system @boost_LDFLAGS@ @boost_iostreams_LIBS@ @boost_locale_LIBS@ @boost_program_options_LIBS@ @boost_thread_LIBS@ @boost_url_LIBS@
3636

0 commit comments

Comments
 (0)