Skip to content

Commit bcff8e2

Browse files
committed
build: only pass --disable-dependency-tracking to packages that understand it
By blanket passing --disable-dependency-tracking to all depends packages we end up with some warnings like: configure: WARNING: unrecognized options: --disable-dependency-tracking So instead, only pass it to packages that understand it. Related to bitcoin/bitcoin#16354.
1 parent 8261587 commit bcff8e2

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
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/expat.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.bz2
55
$(package)_sha256_hash=cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18
66

77
define $(package)_set_vars
8-
$(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples
8+
$(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples --disable-dependency-tracking
99
$(package)_config_opts_linux=--with-pic
1010
endef
1111

depends/packages/fontconfig.mk

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

88
define $(package)_set_vars
9-
$(package)_config_opts=--disable-docs --disable-static --disable-libxml2 --disable-iconv
9+
$(package)_config_opts=--disable-docs --disable-static --disable-libxml2 --disable-iconv --disable-dependency-tracking
1010
endef
1111

1212
define $(package)_config_cmds

depends/packages/libXau.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(package)_dependencies=xproto
88
# When updating this package, check the default value of
99
# --disable-xthreads. It is currently enabled.
1010
define $(package)_set_vars
11-
$(package)_config_opts=--disable-shared --disable-lint-library --without-lint
11+
$(package)_config_opts=--disable-shared --disable-lint-library --without-lint --disable-dependency-tracking
1212
$(package)_config_opts_linux=--with-pic
1313
endef
1414

depends/packages/libevent.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ define $(package)_preprocess_cmds
99
endef
1010

1111
define $(package)_set_vars
12-
$(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress --disable-samples
12+
$(package)_config_opts=--disable-shared --disable-openssl --disable-libevent-regress --disable-samples --disable-dependency-tracking
1313
$(package)_config_opts_release=--disable-debug-mode
1414
$(package)_config_opts_linux=--with-pic
1515
endef

depends/packages/libxcb.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_sha256_hash=98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c
66
$(package)_dependencies=xcb_proto libXau
77

88
define $(package)_set_vars
9-
$(package)_config_opts=--disable-static --disable-build-docs --without-doxygen --without-launchd
9+
$(package)_config_opts=--disable-static --disable-build-docs --without-doxygen --without-launchd --disable-dependency-tracking
1010
# Because we pass -qt-xcb to Qt, it will compile in a set of xcb helper libraries and extensions,
1111
# so we skip building all of the extensions here.
1212
# 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_sha256_hash=efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19
66

77
define $(package)_set_vars
88
$(package)_config_opts=--disable-shared --without-tools --without-tests --disable-sdltest
9-
$(package)_config_opts += --disable-gprof --disable-gcov --disable-mudflap
9+
$(package)_config_opts += --disable-gprof --disable-gcov --disable-mudflap --disable-dependency-tracking
1010
$(package)_config_opts_linux=--with-pic
1111
endef
1212

depends/packages/xproto.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.bz2
55
$(package)_sha256_hash=636162c1759805a5a0114a369dffdeccb8af8c859ef6e1445f26a4e6e046514f
66

77
define $(package)_set_vars
8-
$(package)_config_opts=--without-fop --without-xmlto --without-xsltproc --disable-specs
8+
$(package)_config_opts=--without-fop --without-xmlto --without-xsltproc --disable-specs --disable-dependency-tracking
99
endef
1010

1111
define $(package)_preprocess_cmds

depends/packages/zeromq.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_
88
define $(package)_set_vars
99
$(package)_config_opts=--without-docs --disable-shared --disable-curve --disable-curve-keygen --disable-perf --disable-Werror --disable-drafts
1010
$(package)_config_opts += --without-libsodium --without-libgssapi_krb5 --without-pgm --without-norm --without-vmci
11-
$(package)_config_opts += --disable-libunwind --disable-radix-tree --without-gcov
11+
$(package)_config_opts += --disable-libunwind --disable-radix-tree --without-gcov --disable-dependency-tracking
1212
$(package)_config_opts_linux=--with-pic
1313
$(package)_cxxflags=-std=c++11
1414
endef

0 commit comments

Comments
 (0)