tools/bc: override SUBDIRS variable with Makefile
authorMichael Pratt <mcpratt@pm.me>
Tue, 24 Jun 2025 19:32:09 +0000 (15:32 -0400)
committerRobert Marko <robimarko@gmail.com>
Sat, 26 Jul 2025 12:38:07 +0000 (14:38 +0200)
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@pm.me>
Link: https://github.com/openwrt/openwrt/pull/16522
Signed-off-by: Robert Marko <robimarko@gmail.com>
tools/bc/Makefile
tools/bc/patches/001-no_doc.patch [deleted file]

index f2a19eb2667c2292c23776a9b2a37a743308102d..e86a68c05b72f83b3d8fa89071f71c914e1203fa 100644 (file)
@@ -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 (file)
index 0768e62..0000000
+++ /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