diff options
| author | fanquake <fanquake@gmail.com> | 2023-11-10 17:06:36 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-12-12 13:58:38 +0000 |
| commit | 506634d79d6427925cd458f67799fe59e0ab14dd (patch) | |
| tree | 4d9075c754319dd7904b862ff274660687ba86fd /depends | |
| parent | beb309626381bf189cd2ae8bde83078b9de47c6a (diff) | |
| download | bitcoin-506634d79d6427925cd458f67799fe59e0ab14dd.tar.xz | |
depends: always install libmultiprocess to /lib
On some systems, libmultiprocess would be installed into `lib64`, I
assume due to the use of GNUInstallDirs, however all other libs we build
in depends, go into lib/. Rather than adding lib64/ to the pkg-config
and link flags, I opted for always installing into lib/.
This was changed in
https://github.com/chaincodelabs/libmultiprocess/pull/79 upstream.
Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/libmultiprocess.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk index 765d649377..98eae1e6d6 100644 --- a/depends/packages/libmultiprocess.mk +++ b/depends/packages/libmultiprocess.mk @@ -8,7 +8,12 @@ ifneq ($(host),$(build)) $(package)_dependencies += native_capnp endif +# Hardcode library install path to "lib" to match the PKG_CONFIG_PATH +# 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 := +$(package)_config_opts += -DCMAKE_INSTALL_LIBDIR=lib/ ifneq ($(host),$(build)) $(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp" $(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++" |