[openwrt/openwrt] tools/autoconf-archive: clean up build recipes

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 13 14:59:05 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a1527207b8f23d4084a18e988605fd30c5e72ca8

commit a1527207b8f23d4084a18e988605fd30c5e72ca8
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Wed Sep 7 10:29:49 2022 -0400

    tools/autoconf-archive: clean up build recipes
    
    The configure option datarootdir
    defaults to PREFIX/share.
    
    The Host/Clean define should be Host/Uninstall
    otherwise it is removing the build directory
    before there is a chance to try "make uninstall"
    in that directory.
    Host/Clean/Default is no longer defined.
    
    Use default build recipes defined in host-build.mk
    instead of custom ones that are equivalent.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 tools/autoconf-archive/Makefile | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/tools/autoconf-archive/Makefile b/tools/autoconf-archive/Makefile
index 228a27cf60..ecca997313 100644
--- a/tools/autoconf-archive/Makefile
+++ b/tools/autoconf-archive/Makefile
@@ -9,20 +9,8 @@ PKG_HASH:=e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CONFIGURE_ARGS += \
-	--datarootdir=$(STAGING_DIR_HOST)/share
-
-define Host/Compile
-	export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR)
-endef
-
-define Host/Install
-	export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) install
-endef
-
-define Host/Clean
-	-export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) uninstall
-	$(call Host/Clean/Default)
+define Host/Uninstall
+	-$(call Host/Compile/Default,uninstall)
 endef
 
 $(eval $(call HostBuild))




More information about the lede-commits mailing list