[openwrt/openwrt] tools/bc: override SUBDIRS variable with Makefile

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 26 05:38:22 PDT 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/46506776e6d28263e21540c99575ea5c5de1c7af

commit 46506776e6d28263e21540c99575ea5c5de1c7af
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Tue Jun 24 15:32:09 2025 -0400

    tools/bc: override SUBDIRS variable with Makefile
    
    Instead of editing the SUBDIRS variable with a patch,
    it can be overriden at the end of the command line when invoking Make.
    
    Also, remove use of autoreconf, as this patch
    was the only one that made it necessary.
    
    Removed:
     - 001-no_doc.patch
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    Link: https://github.com/openwrt/openwrt/pull/16522
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 tools/bc/Makefile                 |  5 +++--
 tools/bc/patches/001-no_doc.patch | 21 ---------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/tools/bc/Makefile b/tools/bc/Makefile
index f2a19eb266..e86a68c05b 100644
--- a/tools/bc/Makefile
+++ b/tools/bc/Makefile
@@ -13,13 +13,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/bc
 PKG_HASH:=515430115b3334c636317503460a0950dff79940aa3259ce2c1aa67c2881d023
 
-PKG_FIXUP := autoreconf
 PKG_CPE_ID:=cpe:/a:gnu:bc
 
+PKG_SUBDIRS:=lib bc dc
+
 include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Uninstall
-	-$(call Host/Compile/Default,uninstall)
+	-$(call Host/Compile/Default,uninstall SUBDIRS='lib bc dc')
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/bc/patches/001-no_doc.patch b/tools/bc/patches/001-no_doc.patch
deleted file mode 100644
index 0768e626e8..0000000000
--- a/tools/bc/patches/001-no_doc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = lib bc dc doc
-+SUBDIRS = lib bc dc
- 
- MAINTAINERCLEANFILES =  aclocal.m4 config.h.in configure Makefile.in \
- 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -305,7 +305,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib bc dc doc
-+SUBDIRS = lib bc dc
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in \
- 			stamp-h $(distdir).tar.gz h/number.h depcomp missing
- 




More information about the lede-commits mailing list