Skip to content

Commit 3ca514d

Browse files
committed
Merge #16370: depends: cleanup package configure flags
c295cba depends: zeromq: disable draft classes and methods (fanquake) 0072237 depends: xproto: configure flags cleanup (fanquake) 6a8ada3 depends: qrencode: configure flags cleanup (fanquake) 86beb8c depends: fontconfig: configure flags cleanup (fanquake) e656d95 depends: libxcb: configure flags cleanup (fanquake) e439388 depends: libXau: configure flags cleanup (fanquake) Pull request description: Related to #16354. This PR adds additional configure flags to packages in depends to explicitly disable features we aren't using; similar to #16183. It also fixes passing `--without-tools` to `qrencode`. I've added `--disable-drafts` to `zeromq`: ```bash Build and install draft classes and methods [default=yes] ``` I'm not entirely sure how far we want to take this. i.e in the `zeromq` package we explicitly pass `--without-libsodium`, even though it's disabled by default. Do we also want to explicitly pass all the other `--without` flags? : ```bash --with-libgssapi_krb5 require libzmq build with libgssapi_krb5 [default=no] --with-libsodium use libsodium instead of built-in tweetnacl [default=no] --with-pgm build libzmq with PGM extension. Requires pkg-config [default=no] --with-norm build libzmq with NORM protocol extension, optionally specifying norm path [default=no] --with-vmci build libzmq with VMCI transport [default=no] ``` ACKs for top commit: dongcarl: ACK c295cba Tree-SHA512: df6d38b863b4008ed2cb06c97eb0e21eaa4b5fde552876065ba7f3c87bf6e372e5b954a51bf3fde2151cfb6d2c022227d34337fc6e50ce0caa1d518abbd2412a
2 parents 910ff94 + c295cba commit 3ca514d

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

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
9+
$(package)_config_opts=--disable-docs --disable-static --disable-libxml2 --disable-iconv
1010
endef
1111

1212
define $(package)_config_cmds

depends/packages/libXau.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ $(package)_file_name=$(package)-$($(package)_version).tar.bz2
55
$(package)_sha256_hash=fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2
66
$(package)_dependencies=xproto
77

8+
# When updating this package, check the default value of
9+
# --disable-xthreads. It is currently enabled.
810
define $(package)_set_vars
9-
$(package)_config_opts=--disable-shared
11+
$(package)_config_opts=--disable-shared --disable-lint-library --without-lint
1012
$(package)_config_opts_linux=--with-pic
1113
endef
1214

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
9+
$(package)_config_opts=--disable-static --disable-build-docs --without-doxygen --without-launchd
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/qrencode.mk

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

77
define $(package)_set_vars
8-
$(package)_config_opts=--disable-shared -without-tools --disable-sdltest
8+
$(package)_config_opts=--disable-shared --without-tools --without-tests --disable-sdltest
9+
$(package)_config_opts += --disable-gprof --disable-gcov --disable-mudflap
910
$(package)_config_opts_linux=--with-pic
1011
endef
1112

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=--disable-shared
8+
$(package)_config_opts=--without-fop --without-xmlto --without-xsltproc --disable-specs
99
endef
1010

1111
define $(package)_preprocess_cmds

depends/packages/zeromq.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ $(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d83
66
$(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch
77

88
define $(package)_set_vars
9-
$(package)_config_opts=--without-docs --disable-shared --without-libsodium --disable-curve --disable-curve-keygen --disable-perf --disable-Werror
9+
$(package)_config_opts=--without-docs --disable-shared --disable-curve --disable-curve-keygen --disable-perf --disable-Werror --disable-drafts
10+
$(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
1012
$(package)_config_opts_linux=--with-pic
1113
$(package)_cxxflags=-std=c++11
1214
endef

0 commit comments

Comments
 (0)