From b66dd5efe4c4d0a46f9bda339f0dce509ee14ac9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 23 Dec 2020 20:24:41 +0100 Subject: [PATCH] When building against macOS SDK 11.0 we need an explicit link with bz2. --- src/lib/wscript | 2 +- wscript | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/lib/wscript b/src/lib/wscript index 6ea823728..bff3382e0 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -199,7 +199,7 @@ def build(bld): AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ - CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT + CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG LEQM_NRT """ if bld.env.TARGET_OSX: diff --git a/wscript b/wscript index 4ad119067..b73474719 100644 --- a/wscript +++ b/wscript @@ -253,6 +253,18 @@ def configure(conf): define_name='DCPOMATIC_HAVE_ZIP_SOURCE_T' ) + # libbz2; must be explicitly linked on macOS for some reason + conf.check_cxx(fragment=""" + #include + int main() { BZ2_bzCompressInit(0, 0, 0, 0); } + """, + mandatory=True, + msg="Checking for libbz2", + okmsg='yes', + lib='bz2', + uselib_store="BZ2" + ) + # fontconfig conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True) -- 2.30.2