Skip to content

Commit fd3b4e4

Browse files
committed
Merge #16949: build: only pass --disable-dependency-tracking to packages that understand it
1ba49bc build: pass --enable-option-checking to applicable packages (fanquake) bcff8e2 build: only pass --disable-dependency-tracking to packages that understand it (fanquake) Pull request description: By blanket passing `--disable-dependency-tracking` to all depends packages we end up with warnings (i.e in `bdb` or `freetype`) like: ```bash configure: WARNING: unrecognized options: --disable-dependency-tracking ``` Instead, only pass it to packages that actually understand it. Related to bitcoin/bitcoin#16354. More info on `--disable-dependency-tracking` available [here](https://www.gnu.org/software/automake/manual/html_node/Dependency-Tracking.html). This PR also adds `--enable-option-checking` as a configure option to all applicable packages. ACKs for top commit: laanwj: ACK 1ba49bc theuni: ACK 1ba49bc Tree-SHA512: 6d3143ad5f5d1abed5e0a0b2ffbb4323f21c7bf24b0b8df26fb1b3cd16cf5309bbb830aa5aaec99164d5bbe8e9c62b97aa3e97ee1ddc2c7612bf8ff88a63885e
2 parents ddc3cf2 + 1ba49bc commit fd3b4e4

File tree

13 files changed

+15
-6
lines changed

13 files changed

+15
-6
lines changed

depends/funcs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig
133133
$(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH)
134134
$(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH)
135135
$(1)_stage_env+=PATH=$(build_prefix)/bin:$(PATH)
136-
$(1)_autoconf=./configure --host=$($($(1)_type)_host) --disable-dependency-tracking --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)"
136+
$(1)_autoconf=./configure --host=$($($(1)_type)_host) --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)"
137137

138138
ifneq ($($(1)_nm),)
139139
$(1)_autoconf += NM="$$($(1)_nm)"

depends/packages/bdb.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_sha256_hash=12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b857327
66
$(package)_build_subdir=build_unix
77

88
define $(package)_set_vars
9-
$(package)_config_opts=--disable-shared --enable-cxx --disable-replication
9+
$(package)_config_opts=--disable-shared --enable-cxx --disable-replication --enable-option-checking
1010
$(package)_config_opts_mingw32=--enable-mingw
1111
$(package)_config_opts_linux=--with-pic
1212
$(package)_cxxflags=-std=c++11

depends/packages/expat.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(package)_sha256_hash=cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83
66

77
define $(package)_set_vars
88
$(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples
9+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
910
$(package)_config_opts_linux=--with-pic
1011
endef
1112

depends/packages/fontconfig.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $(package)_dependencies=freetype expat
77

88
define $(package)_set_vars
99
$(package)_config_opts=--disable-docs --disable-static --disable-libxml2 --disable-iconv
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1011
endef
1112

1213
define $(package)_config_cmds

depends/packages/freetype.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(package)_sha256_hash=3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4
66

77
define $(package)_set_vars
88
$(package)_config_opts=--without-zlib --without-png --without-harfbuzz --without-bzip2 --disable-static
9+
$(package)_config_opts += --enable-option-checking
910
$(package)_config_opts_linux=--with-pic
1011
endef
1112

depends/packages/libXau.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $(package)_dependencies=xproto
99
# --disable-xthreads. It is currently enabled.
1010
define $(package)_set_vars
1111
$(package)_config_opts=--disable-shared --disable-lint-library --without-lint
12+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1213
$(package)_config_opts_linux=--with-pic
1314
endef
1415

depends/packages/libevent.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ endef
1010

1111
define $(package)_set_vars
1212
$(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress --disable-samples
13+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1314
$(package)_config_opts_release=--disable-debug-mode
1415
$(package)_config_opts_linux=--with-pic
1516
endef

depends/packages/libxcb.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $(package)_dependencies=xcb_proto libXau
77

88
define $(package)_set_vars
99
$(package)_config_opts=--disable-static --disable-build-docs --without-doxygen --without-launchd
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1011
# Because we pass -qt-xcb to Qt, it will compile in a set of xcb helper libraries and extensions,
1112
# so we skip building all of the extensions here.
1213
# More info is available from: https://doc.qt.io/qt-5.9/linux-requirements.html

depends/packages/protobuf.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $(package)_dependencies=native_$(package)
77
$(package)_cxxflags=-std=c++11
88

99
define $(package)_set_vars
10-
$(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc
10+
$(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc --disable-dependency-tracking
1111
$(package)_config_opts_linux=--with-pic
1212
endef
1313

depends/packages/qrencode.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $(package)_sha256_hash=efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19
77
define $(package)_set_vars
88
$(package)_config_opts=--disable-shared --without-tools --without-tests --disable-sdltest
99
$(package)_config_opts += --disable-gprof --disable-gcov --disable-mudflap
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1011
$(package)_config_opts_linux=--with-pic
1112
endef
1213

0 commit comments

Comments
 (0)