Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

macOS build: build Boost with same custom iconv as rest of MKVToolNix

Browse Source
This commit is contained in:
Moritz Bunkus 2019-09-27 14:24:15 +02:00
parent 71c6319e26
commit e43d58994b
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Rakefile
View File

@ -1035,15 +1035,15 @@ end
# libraries required for all programs via mtxcommon # libraries required for all programs via mtxcommon
$common_libs = [ $common_libs = [
:boost_filesystem,
:boost_regex,
:boost_system,
:magic, :magic,
:flac, :flac,
:z, :z,
:pugixml, :pugixml,
:intl, :intl,
:iconv, :iconv,
:boost_regex,
:boost_filesystem,
:boost_system,
:fmt, :fmt,
] ]

2
packaging/macos/build.sh
View File

@ -243,7 +243,7 @@ function build_gettext {
function build_boost { function build_boost {
local -a args properties local -a args properties
args=(--reconfigure -sICONV_PATH=/usr -j$DRAKETHREADS --prefix=TMPDIR/${TARGET} --libdir=TMPDIR/${TARGET}/lib) args=(--reconfigure -sICONV_PATH=${TARGET} -j$DRAKETHREADS --prefix=TMPDIR/${TARGET} --libdir=TMPDIR/${TARGET}/lib)
properties=(toolset=clang link=static variant=release) properties=(toolset=clang link=static variant=release)
if [[ -n $CXXFLAGS ]] properties+=(cxxflags="${(q)CXXFLAGS}") if [[ -n $CXXFLAGS ]] properties+=(cxxflags="${(q)CXXFLAGS}")
if [[ -n $LDFLAGS ]] properties+=(linkflags="${(q)LDFLAGS}") if [[ -n $LDFLAGS ]] properties+=(linkflags="${(q)LDFLAGS}")