From 1bc2f4f3c6216ece87f0821d68e4e25f821dc382 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 17 Apr 2020 22:23:39 +0800 Subject: treewide: Remove Python variants for non-Python packages This removes Python-related build variants, and adds PYTHON3_PKG_BUILD:=0 and minor build adjustments (where appropriate), for non-Python packages. There should be no changes to build output. This also updates some include paths for python3-package.mk and/or python3-host.mk to be relative to the package Makefile. Signed-off-by: Jeffery To --- libs/libgpiod/Makefile | 1 + libs/newt/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'libs') diff --git a/libs/libgpiod/Makefile b/libs/libgpiod/Makefile index 86604b2de..11bf13ae8 100644 --- a/libs/libgpiod/Makefile +++ b/libs/libgpiod/Makefile @@ -22,6 +22,7 @@ PKG_MAINTAINER:=Michael Heimpold PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk diff --git a/libs/newt/Makefile b/libs/newt/Makefile index 10abe55f4..dd4ddcb2c 100644 --- a/libs/newt/Makefile +++ b/libs/newt/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=newt PKG_VERSION:=0.52.21 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://releases.pagure.org/newt @@ -24,6 +24,7 @@ PKG_CPE_ID:=cpe:/a:fedorahosted:newt PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -73,7 +74,6 @@ $(call Package/newt/Default) SUBMENU:=Python TITLE+= module for Python DEPENDS:=+libnewt +python3-light - VARIANT:=python3 endef define Package/python3-newt/description @@ -93,8 +93,6 @@ CONFIGURE_VARS += $(if $(CONFIG_BUILD_NLS),ac_cv_lib_c_gettext=no) MAKE_VARS+= PYTHON_CONFIG_PATH="$(STAGING_DIR)/host/bin" -Build/Compile=$(call Build/Compile/Default,) - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/newt.h $(1)/usr/include/ -- cgit v1.2.3 From 81e99fa7ffd5439e8fbba5b34a13f80c0e20ea48 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 17 Apr 2020 22:35:31 +0800 Subject: seafile: Remove Python variants, update Python packaging This removes Python build variants and adds PYTHON3_PKG_BUILD:=0 (where appropriate) for the Seafile packages. This also updates the way the Python bindings packages are packaged, using automake installation instead of manual install recipes. Signed-off-by: Jeffery To --- libs/libsearpc/Makefile | 16 ++++++---------- libs/libsearpc/patches/001-no-python-compile.patch | 8 ++++++++ net/seafile-ccnet/Makefile | 13 +++++-------- net/seafile-ccnet/patches/011-no-python-compile.patch | 6 ++++++ net/seafile-seahub/Makefile | 9 +++++---- net/seafile-server/Makefile | 17 ++++------------- .../patches/012-automake-no-python-compile.patch | 14 ++++++++++++++ 7 files changed, 48 insertions(+), 35 deletions(-) create mode 100644 libs/libsearpc/patches/001-no-python-compile.patch create mode 100644 net/seafile-ccnet/patches/011-no-python-compile.patch create mode 100644 net/seafile-server/patches/012-automake-no-python-compile.patch (limited to 'libs') diff --git a/libs/libsearpc/Makefile b/libs/libsearpc/Makefile index 2183b8a47..e084e4eb1 100644 --- a/libs/libsearpc/Makefile +++ b/libs/libsearpc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsearpc PKG_VERSION:=3.2.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/haiwen/libsearpc.git @@ -25,6 +25,7 @@ PKG_FIXUP:=autoreconf PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -50,19 +51,21 @@ define Package/python3-searpc SUBMENU:=Python TITLE:=Python bindings for Searpc DEPENDS:=+libsearpc +python3-light +python3-logging - VARIANT:=python3 endef define Package/python3-searpc/description $(call Package/libsearpc/description) - This package contains the Python bindings for Searpc. + This package contains Python bindings for Searpc. endef CONFIGURE_ARGS += \ --disable-compile-demo \ --disable-server-pkg +CONFIGURE_VARS += \ + PYTHON="$(HOST_PYTHON3_BIN)" + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{bin,include} $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -77,13 +80,6 @@ define Package/libsearpc/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsearpc.so* $(1)/usr/lib/ endef -define Py3Build/Compile - rm -rf $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc - $(INSTALL_DIR) $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc - $(INSTALL_DATA) $(PKG_BUILD_DIR)/pysearpc/*.py $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc/ - rm -f $(PKG_INSTALL_DIR)$(PYTHON3_PKG_DIR)/pysearpc/{pygencode,test_pysearpc}.py -endef - Py3Package/python3-searpc/install:=: $(eval $(call BuildPackage,libsearpc)) diff --git a/libs/libsearpc/patches/001-no-python-compile.patch b/libs/libsearpc/patches/001-no-python-compile.patch new file mode 100644 index 000000000..fc9120b0f --- /dev/null +++ b/libs/libsearpc/patches/001-no-python-compile.patch @@ -0,0 +1,8 @@ +--- a/pysearpc/Makefile.am ++++ b/pysearpc/Makefile.am +@@ -1,4 +1,4 @@ + + pysearpcdir=${pyexecdir}/pysearpc + +-pysearpc_PYTHON = __init__.py client.py common.py errors.py named_pipe.py server.py transport.py utils.py ++pysearpc_DATA = __init__.py client.py common.py errors.py named_pipe.py server.py transport.py utils.py diff --git a/net/seafile-ccnet/Makefile b/net/seafile-ccnet/Makefile index 0d76f01ab..a22883d3d 100644 --- 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)) diff --git a/net/seafile-ccnet/patches/011-no-python-compile.patch b/net/seafile-ccnet/patches/011-no-python-compile.patch new file mode 100644 index 000000000..276b4992b --- /dev/null +++ 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 diff --git a/net/seafile-seahub/Makefile b/net/seafile-seahub/Makefile index 295c7f9f9..d72a2a3bb 100644 --- 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 +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)) diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile index d8c1901da..43cfa9b73 100644 --- 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/ diff --git a/net/seafile-server/patches/012-automake-no-python-compile.patch b/net/seafile-server/patches/012-automake-no-python-compile.patch new file mode 100644 index 000000000..624c8c7c5 --- /dev/null +++ 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 -- cgit v1.2.3