From f52ab00f69f713d4d3c8cb6ef7386ca599eb4c0e Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Fri, 14 Mar 2025 16:19:45 +0100 Subject: [PATCH] build: use make < 3.82 syntax for define directive From the GNU make 3.82 release announcement: * The 'define' make directive now allows a variable assignment operator after the variable name, to allow for simple, conditional, or appending multi-line variable assignment. macOS ships with 3.81. This caused the multiprocess config options to be ignored. Fixes #32068 Co-authored-by: Ryan Ofsky Github-Pull: #32070 Rebased-From: 9157d9e449870851ef455e077249ac46fc2df24c --- depends/packages/capnp.mk | 2 +- depends/packages/libmultiprocess.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk index 2465c8091bb..8942c2b03cb 100644 --- a/depends/packages/capnp.mk +++ b/depends/packages/capnp.mk @@ -9,7 +9,7 @@ $(package)_sha256_hash=$(native_$(package)_sha256_hash) # setting in depends/config.site.in, which also hardcodes "lib". # Without this setting, cmake by default would use the OS library # directory, which might be "lib64" or something else, not "lib", on multiarch systems. -define $(package)_set_vars := +define $(package)_set_vars $(package)_config_opts := -DBUILD_TESTING=OFF $(package)_config_opts += -DWITH_OPENSSL=OFF $(package)_config_opts += -DWITH_ZLIB=OFF diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk index d237f52dbb2..3e47aaf3adc 100644 --- a/depends/packages/libmultiprocess.mk +++ b/depends/packages/libmultiprocess.mk @@ -12,7 +12,7 @@ endif # setting in depends/config.site.in, which also hardcodes "lib". # Without this setting, cmake by default would use the OS library # directory, which might be "lib64" or something else, not "lib", on multiarch systems. -define $(package)_set_vars := +define $(package)_set_vars $(package)_config_opts += -DCMAKE_INSTALL_LIBDIR=lib/ $(package)_config_opts += -DCMAKE_POSITION_INDEPENDENT_CODE=ON ifneq ($(host),$(build))