Merge pull request #11872 from jefferyto/python3-makefile-cleanup

python3: Makefile cleanup
2025-12-26 11:16:31 +04:00 · 2020-04-20 20:05:07 +03:00
parent e40f92c90d 89ae10ed71
commit 6c2235253f
37 changed files with 294 additions and 314 deletions
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -22,6 +22,7 @@ PKG_CPE_ID:=cpe:/a:freeradius:freeradius

 PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
+PYTHON3_PKG_BUILD:=0

 PKG_CONFIG_DEPENDS := \
  FREERADIUS3_OPENSSL \
@@ -30,7 +31,7 @@ PKG_CONFIG_DEPENDS := \
 CFLAGS += $(FPIC)

 include $(INCLUDE_DIR)/package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
+include ../../lang/python/python3-package.mk

 define Package/freeradius3/config
  source "$(SOURCE)/Config.in"
@@ -766,7 +767,6 @@ $(eval $(call BuildPlugin,freeradius3-mod-mschap,rlm_mschap,))
 $(eval $(call BuildPlugin,freeradius3-mod-pap,rlm_pap,))
 $(eval $(call BuildPlugin,freeradius3-mod-passwd,rlm_passwd,))
 $(eval $(call BuildPlugin,freeradius3-mod-preprocess,rlm_preprocess,))
-$(eval $(call Py3Package,freeradius3-mod-python3))
 $(eval $(call BuildPlugin,freeradius3-mod-python3,rlm_python3,))
 $(eval $(call BuildPlugin,freeradius3-mod-radutmp,rlm_radutmp,))
 $(eval $(call BuildPlugin,freeradius3-mod-realm,rlm_realm,))
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=nmap
 PKG_VERSION:=7.80
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -26,6 +26,7 @@ PKG_CPE_ID:=cpe:/a:nmap:nmap

 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PYTHON3_PKG_BUILD:=0

 include $(INCLUDE_DIR)/package.mk
 include ../../lang/python/python3-package.mk
@@ -100,7 +101,6 @@ endef
 define Package/ndiff
 $(call Package/nmap/default)
  DEPENDS:=+python3-light +python3-xml
-  VARIANT:=python3
  TITLE:=Utility to compare the results of Nmap scans
 endef

@@ -148,10 +148,10 @@ CONFIGURE_VARS += \
 PYTHON3_PKG_SETUP_DIR:=ndiff
 PYTHON3_PKG_SETUP_ARGS:=

-ifeq ($(BUILD_VARIANT),python3)
-  Build/Configure:=:
-  Build/Install:=:
-endif
+define Build/Compile
+	$(call Build/Compile/Default,)
+	$(call Py3Build/Compile)
+endef

 define Package/nmap/install
 	$(INSTALL_DIR) $(1)/usr/bin
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -32,6 +32,7 @@ PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
+PYTHON3_PKG_BUILD:=0

 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>

--- a/net/radicale/Makefile
+++ b/net/radicale/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=radicale
 PKG_VERSION:=1.1.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PYPI_NAME:=Radicale
 PKG_HASH:=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b
@@ -37,7 +37,6 @@ define Package/radicale
      +python3-xml
  USERID:=radicale=5232:radicale=5232
  PROVIDES:=radicale-py2 radicale-py3
-  VARIANT:=python3
 endef

 define Package/radicale/description
--- a/net/radicale2/Makefile
+++ b/net/radicale2/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=radicale2
 PKG_VERSION:=2.1.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
@@ -31,7 +31,6 @@ $(call Package/radicale2/Default)
  USERID:=radicale2=225:radicale2=225
  DEPENDS:=+python3 +python3-dateutil +python3-vobject +python3-setuptools
  CONFLICTS:=radicale
-  VARIANT:=python3
 endef

 define Package/radicale2-examples
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -33,13 +33,14 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_kmod-fs-btrfs \
 	CONFIG_PACKAGE_kmod-fs-xfs

+PYTHON3_PKG_BUILD:=0
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-host.mk
-#include $(TOPDIR)/feeds/packages/lang/python/python-package.mk
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
+include ../../lang/python/python3-host.mk
+include ../../lang/python/python3-package.mk

 define Package/samba4/Default
  SECTION:=net
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -37,7 +37,7 @@ define Package/scapy/description
 endef

 define Build/Compile
-	$(call Build/Compile/Py3Mod,., \
+	$(call Python3/ModSetup,., \
 		install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \
 	)
 endef
--- a/net/seafile-ccnet/Makefile
+++ b/net/seafile-ccnet/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=seafile-ccnet
 PKG_VERSION:=7.1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/haiwen/ccnet-server/tar.gz/v$(PKG_VERSION)-server?
@@ -25,6 +25,7 @@ PKG_BUILD_DEPENDS:=vala/host
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PYTHON3_PKG_BUILD:=0

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -58,7 +59,6 @@ define Package/python3-seafile-ccnet
  SUBMENU:=Python
  TITLE:=Python bindings for Seafile Ccnet
  DEPENDS:=+seafile-ccnet +python3-light +python3-searpc
-  VARIANT:=python3
 endef

 define Package/python3-seafile-ccnet/description
@@ -73,6 +73,9 @@ CONFIGURE_ARGS += \
 	--enable-python \
 	--with-mysql="$(STAGING_DIR)/usr/bin/mysql_config"

+CONFIGURE_VARS += \
+	PYTHON="$(HOST_PYTHON3_BIN)"
+
 define Package/seafile-ccnet/install
 	$(INSTALL_DIR) $(1)/usr/{lib,libexec}
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/libexec/
@@ -88,12 +91,6 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libccnet.{a,la,so*} $(1)/usr/lib/
 endef

-define Py3Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/ccnet
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/ccnet
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/python/ccnet/*.py $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/ccnet/
-endef
-
 Py3Package/python3-seafile-ccnet/install:=:

 $(eval $(call BuildPackage,seafile-ccnet))
--- a/net/seafile-ccnet/patches/011-no-python-compile.patch
+++ b/net/seafile-ccnet/patches/011-no-python-compile.patch
@@ -0,0 +1,6 @@
+--- a/python/ccnet/Makefile.am
+++ b/python/ccnet/Makefile.am
+@@ -1,2 +1,2 @@
+ ccnetdir=${pyexecdir}/ccnet
+-ccnet_PYTHON = __init__.py rpc.py
+ccnet_DATA = __init__.py rpc.py
--- a/net/seafile-seahub/Makefile
+++ b/net/seafile-seahub/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=seafile-seahub
 PKG_VERSION:=7.1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seahub/tar.gz/v$(PKG_VERSION)-server?
@@ -24,6 +24,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/seahub-$(PKG_VERSION)-server
 HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="Django~=1.11"

 PKG_BUILD_PARALLEL:=1
+PYTHON3_PKG_BUILD:=0

 include $(INCLUDE_DIR)/package.mk
 include ../../lang/python/python3-package.mk
@@ -57,7 +58,6 @@ define Package/seafile-seahub
    +python3-requests-oauthlib \
    +python3-seafile-ccnet \
    +python3-searpc
-  VARIANT:=python3
 endef

 define Package/seafile-seahub/description
@@ -75,10 +75,9 @@ MAKE_VARS += \
 	PYTHON="$(HOST_PYTHON3_BIN)" \
 	DJANGO_ADMIN_PY="$(STAGING_DIR_HOSTPKG)/bin/django-admin"

-define Py3Build/Compile
-	$(call Build/Compile/HostPy3PipInstall,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS))
+define Build/Compile
+	$(call HostPython3/PipInstall,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS))
 	$(call Build/Compile/Default,locale)
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
 endef

 define Py3Package/seafile-seahub/install
@@ -90,6 +89,8 @@ define Py3Package/seafile-seahub/install
 	mv $(1)/usr/share/seafile/seafile-server/seahub/media/avatars $(1)/usr/share/seafile/seafile-server/seahub/media/avatars_default
 endef

+Py3Package/seafile-seahub/filespec:=
+
 $(eval $(call Py3Package,seafile-seahub))
 $(eval $(call BuildPackage,seafile-seahub))
 $(eval $(call BuildPackage,seafile-seahub-src))
--- a/net/seafile-server/Makefile
+++ b/net/seafile-server/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=seafile-server
 PKG_VERSION:=7.1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seafile-server/tar.gz/v$(PKG_VERSION)-server?
@@ -25,6 +25,7 @@ PKG_BUILD_DEPENDS:=vala/host libevhtp
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PYTHON3_PKG_BUILD:=0

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -111,7 +112,6 @@ define Package/python3-seafile-server
  SUBMENU:=Python
  TITLE:=Python bindings for Seafile server
  DEPENDS:=+python3-light +python3-logging +python3-searpc +python3-seafile-ccnet
-  VARIANT:=python3
 endef

 define Package/python3-seafile-server/description
@@ -126,10 +126,8 @@ CONFIGURE_ARGS += \
 	--enable-python \
 	--with-mysql="$(STAGING_DIR)/usr/bin/mysql_config"

-# This is required as python3-package.mk overrides the default setting of having interlinking enabled
-ifdef CONFIG_USE_MIPS16
-  TARGET_CFLAGS += -minterlink-mips16
-endif
+CONFIGURE_VARS += \
+	PYTHON="$(HOST_PYTHON3_BIN)"

 ifdef CONFIG_GCC_LIBSSP
  TARGET_LDFLAGS += -lssp
@@ -199,13 +197,6 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libseafile.pc $(1)/usr/lib/pkgconfig/
 endef

-define Py3Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/{seafile,seaserv}
-	$(INSTALL_DIR) $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/{seafile,seaserv}
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/python/seafile/*.py $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/seafile/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/python/seaserv/*.py $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/seaserv/
-endef
-
 define Package/seafile-server-fuse/install
 	$(INSTALL_DIR) $(1)/usr/{bin,libexec}
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/seaf-fuse $(1)/usr/libexec/
--- a/net/seafile-server/patches/012-automake-no-python-compile.patch
+++ b/net/seafile-server/patches/012-automake-no-python-compile.patch
@@ -0,0 +1,14 @@
+--- a/python/seafile/Makefile.am
+++ b/python/seafile/Makefile.am
+@@ -1,3 +1,3 @@
+ seafiledir=${pyexecdir}/seafile
+ 
+-seafile_PYTHON = __init__.py rpcclient.py
+seafile_DATA = __init__.py rpcclient.py
+--- a/python/seaserv/Makefile.am
+++ b/python/seaserv/Makefile.am
+@@ -1,3 +1,3 @@
+ seaservdir=${pyexecdir}/seaserv
+ 
+-seaserv_PYTHON = __init__.py service.py api.py
+seaserv_DATA = __init__.py service.py api.py
--- a/net/sysrepo/Makefile
+++ b/net/sysrepo/Makefile
@@ -22,6 +22,7 @@ PKG_LICENSE_FILES:=LICENSE
 CMAKE_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=swig/host
+PYTHON3_PKG_BUILD:=0

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
--- a/net/uwsgi/Makefile
+++ b/net/uwsgi/Makefile
@@ -9,6 +9,7 @@ PKG_SOURCE_URL=https://files.pythonhosted.org/packages/source/u/uwsgi/
 PKG_HASH:=4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583
 PKG_BUILD_DIR:=$(BUILD_DIR)/uwsgi-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=python3/host
+PYTHON3_PKG_BUILD:=0

 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE
@@ -108,8 +109,8 @@ define Build/Compile
 	$(call Build/Compile/Default,plugin.logfile PROFILE=openwrt)
 	$(call Build/Compile/Default,plugin.syslog PROFILE=openwrt)
 	$(call Build/Compile/Default,plugin.cgi PROFILE=openwrt)
-	$(call Build/Compile/HostPy3RunTarget, \
-		cd $(PKG_BUILD_DIR), \
+	$(call Python3/Run, \
+		$(PKG_BUILD_DIR), \
 		uwsgiconfig.py --plugin plugins/python openwrt, \
 		CPP="$(TARGET_CROSS)cpp" \
 		LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION) \