Skip to content

Commit 506634d

Browse files
fanquakeryanofsky
andcommitted
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 bitcoin-core/libmultiprocess#79 upstream. Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
1 parent beb3096 commit 506634d

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

depends/packages/libmultiprocess.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ ifneq ($(host),$(build))
88
$(package)_dependencies += native_capnp
99
endif
1010

11+
# Hardcode library install path to "lib" to match the PKG_CONFIG_PATH
12+
# setting in depends/config.site.in, which also hardcodes "lib".
13+
# Without this setting, cmake by default would use the OS library
14+
# directory, which might be "lib64" or something else, not "lib", on multiarch systems.
1115
define $(package)_set_vars :=
16+
$(package)_config_opts += -DCMAKE_INSTALL_LIBDIR=lib/
1217
ifneq ($(host),$(build))
1318
$(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
1419
$(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"

0 commit comments

Comments
 (0)