python3: use gdbm for Berkley dbm

Python works with GNU DBM and with Berkley DBM.
Berkley DBM has been under Oracle for some time.

And it's not clear how many Python users actually use DBM.

In the packages feed, we have both libdb47 (which is now under Oracle) and
GNU DBM. The GNU DBM has a compatibility layer for Berkley DBM.
There are newer versions than libdb47, but it's probably not worth having
them yet. The libbd47 tarball is ~40+ MB. Odds are newer versions will be
bigger and more bloated.

This change merges the old `python3-gdbm` package into the `python3-dbm`
package, since they are effectively using the same underlying library now,
i.e. gdbm.

Signed-off-by: Alexandru Ardelean <redacted>

diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 17356c71e27776df76fee965fa3678e6961631e2..794d003b1f1187cff9c671fc5296eab7e5a580f0 100644 (file)
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 include ../python3-version.mk
 
 PKG_NAME:=python3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
 
 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz

diff --git a/lang/python/python3/files/python3-package-dbm.mk b/lang/python/python3/files/python3-package-dbm.mk
index 409940229ac82b2a087c20426dc04235370e52f1..ede9af1631580306ac82eac9e3ad15fee5b74831 100644 (file)
--- a/lang/python/python3/files/python3-package-dbm.mk
+++ b/lang/python/python3/files/python3-package-dbm.mk
@@ -8,10 +8,11 @@
 define Package/python3-dbm
 $(call Package/python3/Default)
   TITLE:=Python $(PYTHON3_VERSION) dbm module
-  DEPENDS:=+python3-light +libdb47
+  DEPENDS:=+python3-light +libgdbm
 endef
 
 $(eval $(call Py3BasePackage,python3-dbm, \
        /usr/lib/python$(PYTHON3_VERSION)/dbm \
        /usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_dbm.$(PYTHON3_SO_SUFFIX) \
+       /usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_gdbm.$(PYTHON3_SO_SUFFIX) \
 ))

diff --git a/lang/python/python3/files/python3-package-gdbm.mk b/lang/python/python3/files/python3-package-gdbm.mk
deleted file mode 100644 (file)
index 7f98bad..0000000
--- a/lang/python/python3/files/python3-package-gdbm.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (C) 2006-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/python3-gdbm
-$(call Package/python3/Default)
-  TITLE:=Python $(PYTHON3_VERSION) gdbm module
-  DEPENDS:=+python3-light +libgdbm
-endef
-
-$(eval $(call Py3BasePackage,python3-gdbm, \
-       /usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_gdbm.$(PYTHON3_SO_SUFFIX) \
-))