From 407062f2ac93624f350e9e8a4f641c882a2aaf2f Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 5 Feb 2025 14:25:22 +0000 Subject: [PATCH] depends: Avoid using the `-ffile-prefix-map` compiler option The `-ffile-prefix-map` compiler option implicitly enables `-fprofile-prefix-map` in GCC or `-fcoverage-prefix-map` in Clang, which can cause issues with coverage builds. This change ensures that only the options necessary for build reproducibility are applied. --- depends/packages/capnp.mk | 2 +- depends/packages/libevent.mk | 2 +- depends/packages/libmultiprocess.mk | 2 +- depends/packages/zeromq.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk index 0c211cbc455..7f41d3b5a4e 100644 --- a/depends/packages/capnp.mk +++ b/depends/packages/capnp.mk @@ -9,7 +9,7 @@ define $(package)_set_vars := $(package)_config_opts := -DBUILD_TESTING=OFF $(package)_config_opts += -DWITH_OPENSSL=OFF $(package)_config_opts += -DWITH_ZLIB=OFF - $(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr + $(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr endef define $(package)_config_cmds diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index 14ad24a1ded..a55684ae117 100644 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -13,7 +13,7 @@ define $(package)_set_vars $(package)_config_opts=-DCMAKE_BUILD_TYPE=None -DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_OPENSSL=ON $(package)_config_opts+=-DEVENT__DISABLE_SAMPLES=ON -DEVENT__DISABLE_REGRESS=ON $(package)_config_opts+=-DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=STATIC - $(package)_cflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr + $(package)_cflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr $(package)_cppflags += -D_GNU_SOURCE $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0A00 diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk index a181e05100b..afbd315e388 100644 --- a/depends/packages/libmultiprocess.mk +++ b/depends/packages/libmultiprocess.mk @@ -13,7 +13,7 @@ ifneq ($(host),$(build)) $(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp" $(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++" endif -$(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr +$(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr endef define $(package)_config_cmds diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 89e10d15efd..8bf84b1f1cb 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -17,7 +17,7 @@ define $(package)_set_vars $(package)_config_opts += -DWITH_LIBBSD=OFF -DENABLE_CURVE=OFF -DENABLE_CPACK=OFF $(package)_config_opts += -DBUILD_SHARED=OFF -DBUILD_TESTS=OFF -DZMQ_BUILD_TESTS=OFF $(package)_config_opts += -DENABLE_DRAFTS=OFF -DZMQ_BUILD_TESTS=OFF - $(package)_cxxflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr + $(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr $(package)_config_opts_mingw32 += -DZMQ_WIN32_WINNT=0x0A00 -DZMQ_HAVE_IPC=OFF endef