Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15863 from commodo/python-gdbm

Browse source 
python3: use gdbm for Berkley dbm
This commit is contained in:
Rosen Penev 2021-07-13 18:22:57 -07:00 committed by GitHub
commit 1697536dde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/python/python3/Makefile
View file

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
include ../python3-version.mk include ../python3-version.mk
PKG_NAME:=python3 PKG_NAME:=python3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz

3
lang/python/python3/files/python3-package-dbm.mk
View file

@ -8,10 +8,11 @@
define Package/python3-dbm define Package/python3-dbm
$(call Package/python3/Default) $(call Package/python3/Default)
TITLE:=Python $(PYTHON3_VERSION) dbm module TITLE:=Python $(PYTHON3_VERSION) dbm module
DEPENDS:=+python3-light +libdb47 DEPENDS:=+python3-light +libgdbm
endef endef
$(eval $(call Py3BasePackage,python3-dbm, \ $(eval $(call Py3BasePackage,python3-dbm, \
/usr/lib/python$(PYTHON3_VERSION)/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/_dbm.$(PYTHON3_SO_SUFFIX) \
/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_gdbm.$(PYTHON3_SO_SUFFIX) \
)) ))

16
lang/python/python3/files/python3-package-gdbm.mk
View file

@ -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) \
))

12
libs/gdbm/Makefile
View file

@ -19,7 +19,7 @@ PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1 PKG_INSTALL:=2
PKG_BUILD_PARALLEL:=0 PKG_BUILD_PARALLEL:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -38,8 +38,8 @@ define Package/libgdbm/description
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-shared \ --enable-libgdbm-compat \
--enable-static --enable-shared
define Build/Compile define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
@ -51,14 +51,16 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/{gdbm,ndbm}.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm_compat.so* $(1)/usr/lib/
endef endef
define Package/libgdbm/install define Package/libgdbm/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm_compat.so* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libgdbm)) $(eval $(call BuildPackage,libgdbm))