Skip to content

Commit 927c2c4

Browse files
committed
Merge bitcoin/bitcoin#22783: build: Cleanup depends build system
539ca40 build: Remove unneeded share/man directory from libXau package (Hennadii Stepanov) 6c25c83 build: Remove unneeded share/man directory from freetype package (Hennadii Stepanov) 9067c6c build: Remove empty var/cache/fontconfig directory from fontconfig (Hennadii Stepanov) 4a37c26 build: Remove unneeded share/doc directory from expat package (Hennadii Stepanov) acb9400 build: Drop non-existent share/pkgconfig directory (Hennadii Stepanov) Pull request description: This PR: - removes non-existent `share/pkgconfig` path from `PKG_CONFIG_PATH`. This change, actually, make `PKG_CONFIG_PATH` unused in the depends build system - removes `doc`, `man` and empty directories from the built packages ACKs for top commit: fanquake: ACK 539ca40 Tree-SHA512: 41ffd5cea962f7533cb5d66ff9e8fd71a3dd7a8d9568b1bb63fc68e7070d7e416f6db02a0f8ab4d94063ee7f6370f00d62a5791b44f0d21c10666af590268c36
2 parents ff65b69 + 539ca40 commit 927c2c4

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

depends/packages/expat.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ define $(package)_stage_cmds
2323
endef
2424

2525
define $(package)_postprocess_cmds
26-
rm lib/*.la
26+
rm -rf share lib/*.la
2727
endef

depends/packages/fontconfig.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ define $(package)_stage_cmds
2929
endef
3030

3131
define $(package)_postprocess_cmds
32-
rm lib/*.la
32+
rm -rf var lib/*.la
3333
endef

depends/packages/freetype.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ define $(package)_stage_cmds
2323
endef
2424

2525
define $(package)_postprocess_cmds
26-
rm lib/*.la
26+
rm -rf share/man lib/*.la
2727
endef

depends/packages/libXau.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ define $(package)_stage_cmds
3030
endef
3131

3232
define $(package)_postprocess_cmds
33-
rm lib/*.la
33+
rm -rf share lib/*.la
3434
endef

depends/packages/qt.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ endef
248248
define $(package)_config_cmds
249249
export PKG_CONFIG_SYSROOT_DIR=/ && \
250250
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
251-
export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig && \
252251
cd qtbase && \
253252
./configure -top-level $($(package)_config_opts)
254253
endef

0 commit comments

Comments
 (0)