From 57945ce33755b4dcec4e376e617b0ed19b2ac55e Mon Sep 17 00:00:00 2001 From: merge-script Date: Thu, 25 Jul 2024 13:59:19 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#30506: depends: Cleanup postprocess commands after switching to CMake a0314c151679a348d842b68c5ecb7a556700811c depends: cleanup after qrencode build (fanquake) 745bf0fa7e9afc3989e9c60d7ef09e96ae172277 depends: cleanup after miniupnpc build (fanquake) 06d4aab77af4e75f0e8fd96a93e108f92210d878 depends: Cleanup postprocess commands after switching to CMake (Hennadii Stepanov) Pull request description: I overlooked this while reviewing https://github.com/bitcoin/bitcoin/pull/29723, https://github.com/bitcoin/bitcoin/pull/29835, and https://github.com/bitcoin/bitcoin/pull/29880. ACKs for top commit: fanquake: ACK a0314c151679a348d842b68c5ecb7a556700811c Tree-SHA512: debeffa7027e6213cc25c0652660ff0f36f51e63f688041d1d6cd6323e2c6cb02936fa0ecea86455b8c9874d6ea665684085189cfa523ca084792c57b0fb7c4e --- depends/packages/freetype.mk | 3 --- depends/packages/libevent.mk | 2 +- depends/packages/miniupnpc.mk | 5 +++++ depends/packages/qrencode.mk | 4 ++++ depends/packages/zeromq.mk | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/depends/packages/freetype.mk b/depends/packages/freetype.mk index c942cbb936..fef0beaa7b 100644 --- a/depends/packages/freetype.mk +++ b/depends/packages/freetype.mk @@ -24,6 +24,3 @@ define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install endef -define $(package)_postprocess_cmds - rm -rf share/man -endef diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk index 5110e249db..7b5ee2b9ce 100644 --- a/depends/packages/libevent.mk +++ b/depends/packages/libevent.mk @@ -36,7 +36,7 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm bin/event_rpcgen.py && \ + rm -rf bin && \ rm include/ev*.h && \ rm include/event2/*_compat.h endef diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk index 7ad2529e47..f60ef824ab 100644 --- a/depends/packages/miniupnpc.mk +++ b/depends/packages/miniupnpc.mk @@ -28,3 +28,8 @@ define $(package)_stage_cmds install *.h $($(package)_staging_prefix_dir)/include/miniupnpc &&\ install libminiupnpc.a $($(package)_staging_prefix_dir)/lib endef + +define $(package)_postprocess_cmds + rm -rf bin && \ + rm -rf share +endef diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk index 4d852d833d..c769ae078f 100644 --- a/depends/packages/qrencode.mk +++ b/depends/packages/qrencode.mk @@ -28,3 +28,7 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install endef + +define $(package)_postprocess_cmds + rm -rf share +endef diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 28f730ae6d..e7f3000017 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -46,5 +46,5 @@ define $(package)_stage_cmds endef define $(package)_postprocess_cmds - rm -rf bin share lib/*.la + rm -rf share endef