boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-26 02:27:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing NO_LIB usage requirements.

Browse Source
This commit is contained in:
Rene Rivera
2024-04-28 20:16:39 -05:00
parent 8e2a51e905
commit 801d83fb4f
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build/Jamfile.v2
View File

@ -1,6 +1,6 @@
# copyright John Maddock 2003 # copyright John Maddock 2003
# Distributed under the Boost Software License, Version 1.0. # Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at # (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt. # http://www.boost.org/LICENSE_1_0.txt.
import modules ; import modules ;
@ -17,13 +17,13 @@ local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
rule path_options ( properties * ) rule path_options ( properties * )
{ {
local result ; local result ;
if <address-model>64 in $(properties) && <toolset>msvc in $(properties) if <address-model>64 in $(properties) && <toolset>msvc in $(properties)
{ {
result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ; result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
} }
else else
{ {
result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ; result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
} }
return $(result) ; return $(result) ;
} }
@ -34,24 +34,24 @@ rule path_options ( properties * )
if ! $(disable-icu) if ! $(disable-icu)
{ {
if [ modules.peek : ICU_LINK ] if [ modules.peek : ICU_LINK ]
{ {
errors.user-error : "The ICU_LINK option is no longer supported by the Boost.Regex build - please refer to the documentation for equivalent options" ; errors.user-error : "The ICU_LINK option is no longer supported by the Boost.Regex build - please refer to the documentation for equivalent options" ;
} }
if [ modules.peek : ICU_PATH ] if [ modules.peek : ICU_PATH ]
{ {
ICU_PATH = [ modules.peek : ICU_PATH ] ; ICU_PATH = [ modules.peek : ICU_PATH ] ;
} }
if [ modules.peek : ICU_ICUUC_NAME ] if [ modules.peek : ICU_ICUUC_NAME ]
{ {
ICU_ICUUC_NAME = [ modules.peek : ICU_ICUUC_NAME ] ; ICU_ICUUC_NAME = [ modules.peek : ICU_ICUUC_NAME ] ;
} }
if [ modules.peek : ICU_ICUDT_NAME ] if [ modules.peek : ICU_ICUDT_NAME ]
{ {
ICU_ICUDT_NAME = [ modules.peek : ICU_ICUDT_NAME ] ; ICU_ICUDT_NAME = [ modules.peek : ICU_ICUDT_NAME ] ;
} }
if [ modules.peek : ICU_ICUIN_NAME ] if [ modules.peek : ICU_ICUIN_NAME ]
{ {
ICU_ICUIN_NAME = [ modules.peek : ICU_ICUIN_NAME ] ; ICU_ICUIN_NAME = [ modules.peek : ICU_ICUIN_NAME ] ;
} }
@ -102,8 +102,8 @@ if ! $(disable-icu)
lib icuin : : <name>this_is_an_invalid_library_name ; lib icuin : : <name>this_is_an_invalid_library_name ;
} }
ICU_OPTS = ICU_OPTS =
<include>$(ICU_PATH)/include <include>$(ICU_PATH)/include
<runtime-link>shared:<library>icuuc/<link>shared <runtime-link>shared:<library>icuuc/<link>shared
<runtime-link>shared:<library>icudt/<link>shared <runtime-link>shared:<library>icudt/<link>shared
<runtime-link>shared:<library>icuin/<link>shared <runtime-link>shared:<library>icuin/<link>shared
@ -111,7 +111,7 @@ if ! $(disable-icu)
<runtime-link>static:<library>icudt <runtime-link>static:<library>icudt
<runtime-link>static:<library>icuin <runtime-link>static:<library>icuin
<target-os>windows,<toolset>clang:<linkflags>"advapi32.lib" <target-os>windows,<toolset>clang:<linkflags>"advapi32.lib"
<define>BOOST_HAS_ICU=1 <define>BOOST_HAS_ICU=1
<runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1 <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
; ;
@ -144,13 +144,15 @@ explicit has_icu ;
alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ; alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ;
SOURCES = SOURCES =
posix_api.cpp posix_api.cpp
wide_posix_api.cpp wide_posix_api.cpp
; ;
lib boost_regex : ../src/$(SOURCES) icu_options lib boost_regex : ../src/$(SOURCES) icu_options
: :
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
<toolset>gcc-cygwin:<link>static <toolset>gcc-cygwin:<link>static
: : :
<define>BOOST_REGEX_NO_LIB=1
; ;