From 76045bb9d6808931cd0f2933203b5b611e032ec8 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 22 Mar 2024 16:50:40 +0000 Subject: [PATCH] depends: always set CMAKE_POSITION_INDEPENDENT_CODE=ON Rather than potentially having to set this per-package, set it globally, as this should always be what we want. Without doing this, changes in later commits will have to add this per-package. Similar to https://github.com/bitcoin/bitcoin/pull/29488, which is the Autotools equivalent. --- depends/funcs.mk | 1 + depends/packages.md | 2 +- depends/packages/libmultiprocess.mk | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/funcs.mk b/depends/funcs.mk index 0d3bc2c5261..494ed5d3245 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -181,6 +181,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \ LDFLAGS="$$($(1)_ldflags)" \ cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \ -DCMAKE_INSTALL_LIBDIR=lib/ \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ $$($(1)_config_opts) ifeq ($($(1)_type),build) $(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib" diff --git a/depends/packages.md b/depends/packages.md index c288032766d..0ffdc66d488 100644 --- a/depends/packages.md +++ b/depends/packages.md @@ -163,7 +163,7 @@ From the [Gentoo Wiki entry](https://wiki.gentoo.org/wiki/Project:Quality_Assura > ecosystem, as it leads to a massive number of unnecessary rebuilds. Where possible, packages are built with Position Independant Code. Either using -the autotools `--with-pic` flag, or `DCMAKE_POSITION_INDEPENDENT_CODE` with CMake. +the Autotools `--with-pic` flag, or `CMAKE_POSITION_INDEPENDENT_CODE` with CMake. ## Secondary dependencies: diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk index 03527100d42..765d6493776 100644 --- a/depends/packages/libmultiprocess.mk +++ b/depends/packages/libmultiprocess.mk @@ -9,7 +9,6 @@ $(package)_dependencies += native_capnp endif define $(package)_set_vars := -$(package)_config_opts += -DCMAKE_POSITION_INDEPENDENT_CODE=ON ifneq ($(host),$(build)) $(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp" $(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"