summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-01-20 16:50:38 +0100
committerCarl Hetherington <cth@carlh.net>2024-01-20 16:50:38 +0100
commitbaf6f95e13c969da1f6fe430a95ca9bd40051485 (patch)
treee468aefdece1639cccca6d66b45819e0d593201a
parenta7b6fe096f6072c97a1174cc2b8945fa9486fc4f (diff)
Explicitly link zlib to keep new macOS environment happy.
-rw-r--r--src/lib/wscript1
-rw-r--r--wscript12
2 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/wscript b/src/lib/wscript
index ce36832be..d71f2a368 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -229,6 +229,7 @@ def build(bld):
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++
CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT
+ LIBZ
"""
if bld.env.TARGET_OSX:
diff --git a/wscript b/wscript
index 8ff3a6217..7395679fb 100644
--- a/wscript
+++ b/wscript
@@ -278,6 +278,18 @@ def configure(conf):
uselib_store="BZ2"
)
+ # libz; must be explicitly linked on macOS for some reason
+ conf.check_cxx(fragment="""
+ #include <zlib.h>
+ int main() { zlibVersion(); }
+ """,
+ mandatory=True,
+ msg="Checking for libz",
+ okmsg='yes',
+ lib='z',
+ uselib_store="LIBZ"
+ )
+
# fontconfig
conf.check_cfg(package='fontconfig', args='--cflags --libs', uselib_store='FONTCONFIG', mandatory=True)