depends: always set CMAKE_INSTALL_LIBDIR=lib/
Rather than setting this per package, set it globally, as this is always what we want. Without doing this, later commit will have to add the same doc + change to more packages.
This commit is contained in:
3 files changed
+7
-11
No files matched your search
@@ -5,15 +5,10 @@ $(package)_download_file=$(native_$(package)_download_file)
|
||||
$(package)_file_name=$(native_$(package)_file_name)
|
||||
$(package)_sha256_hash=$(native_$(package)_sha256_hash)
|
||||
|
||||
# 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 := -DBUILD_TESTING=OFF
|
||||
$(package)_config_opts += -DWITH_OPENSSL=OFF
|
||||
$(package)_config_opts += -DWITH_ZLIB=OFF
|
||||
$(package)_config_opts += -DCMAKE_INSTALL_LIBDIR=lib/
|
||||
endef
|
||||
|
||||
define $(package)_config_cmds
|
||||
|
||||
@@ -8,12 +8,7 @@ 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/
|
||||
$(package)_config_opts += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
|
||||
ifneq ($(host),$(build))
|
||||
$(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
|
||||
|
||||
Reference in new issue
Block a user