bc: drop disable-doc patch for PKG_SUBDIRS

001-disable-doc.patch dropped the doc subdir (which needs makeinfo) from
SUBDIRS in Makefile.in. Use PKG_SUBDIRS:=lib bc dc, OpenWrt's wired-in knob
for restricting the build, to skip doc without patching.

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/utils/bc/Makefile b/utils/bc/Makefile
index f48199c534578d4060d015432817e759ec0b3252..9c9117ed51f1c55bb7a81809d67faef540410f5b 100644 (file)
--- a/utils/bc/Makefile
+++ b/utils/bc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bc
 PKG_VERSION:=1.08.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/bc
@@ -20,6 +20,9 @@ PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:gnu:bc
 
+# Build only the library and calculators; skip the doc subdir (needs makeinfo).
+PKG_SUBDIRS:=lib bc dc
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bc/Default

diff --git a/utils/bc/patches/001-disable-doc.patch b/utils/bc/patches/001-disable-doc.patch
deleted file mode 100644 (file)
index a555c4f..0000000
--- a/utils/bc/patches/001-disable-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-