Skip to content
Snippets Groups Projects
Verified Commit f2b315e1 authored by Karel Koci's avatar Karel Koci :metal:
Browse files

patches: packages: drop python host build patches

Upstream prefers to use pip to install dependencies to build_dir instead
of global host directory. That means that these patches are not going to
be upstreamed and we replaced them with upstream suggester approach.
parent 63852d07
Branches
Tags
1 merge request!123Turris OS 5.0 (HBK)
From ee33df8a3c73a0605030764859ddac75f8396b2d Mon Sep 17 00:00:00 2001
From: Stepan Henek <stepan.henek@nic.cz>
Date: Wed, 22 Aug 2018 13:05:02 +0200
Subject: [PATCH] python-jinja2: Add host build
Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
---
lang/python/Jinja2/Makefile | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/lang/python/Jinja2/Makefile b/lang/python/Jinja2/Makefile
index 4c9d9eb..40eda51 100644
--- a/lang/python/Jinja2/Makefile
+++ b/lang/python/Jinja2/Makefile
@@ -17,10 +17,16 @@ PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(BUILD_VARIANT)-libsass-$(PKG_VERSION)
PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+HOST_UNPACK=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+HOST_BUILD_DEPENDS:=python3/host MarkupSafe/host
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
include ../python3-package.mk
+include ../python3-host.mk
define Package/python3-jinja2
SECTION:=lang
@@ -37,6 +43,14 @@ Jinja2 is a full featured template engine for Python. It has full
unicode support, an optional integrated sandboxed execution
environment, widely used and BSD licensed.
endef
+
+define Host/Compile
+ $(call Build/Compile/HostPy3Mod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
+endef
+
+Host/Install:=
+
+$(eval $(call HostBuild))
$(eval $(call Py3Package,python3-jinja2))
$(eval $(call BuildPackage,python3-jinja2))
--
2.21.0
From 84767ae0c3535c10e1b198374fd3ce7a1c3828b9 Mon Sep 17 00:00:00 2001
From: Stepan Henek <stepan.henek@nic.cz>
Date: Wed, 22 Aug 2018 11:08:34 +0200
Subject: [PATCH] python-markupsafe: Add host build
Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
---
lang/python/MarkupSafe/Makefile | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/lang/python/MarkupSafe/Makefile b/lang/python/MarkupSafe/Makefile
index d3e119a..9eb9a2a 100644
--- a/lang/python/MarkupSafe/Makefile
+++ b/lang/python/MarkupSafe/Makefile
@@ -11,16 +11,21 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/M/MarkupSafe
PKG_HASH:=29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b
-PKG_BUILD_DEPENDS:=python python3
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)
PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+HOST_UNPACK=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+HOST_BUILD_DEPENDS:=python3/host
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
include ../python3-package.mk
+include ../python3-host.mk
define Package/python3-markupsafe
SECTION:=lang
@@ -36,5 +41,12 @@ define Package/python3-markupsafe/description
MarkupSafe implements a XML/HTML/XHTML Markup safe string for Python
endef
+define Host/Compile
+ $(call Build/Compile/HostPy3Mod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
+endef
+
+Host/Install:=
+
+$(eval $(call HostBuild))
$(eval $(call Py3Package,python3-markupsafe))
$(eval $(call BuildPackage,python3-markupsafe))
--
2.21.0
From d1c051698e20ed687bbd03399580265d523bed3f Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Tue, 23 Jan 2018 18:16:51 +0100
Subject: [PATCH 09/12] python-ply: Add host build
Might be handy to somebody and we actually need it.
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
lang/python/python-ply/Makefile | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/lang/python/python-ply/Makefile b/lang/python/python-ply/Makefile
index 85aa740..258b04e 100644
--- a/lang/python/python-ply/Makefile
+++ b/lang/python/python-ply/Makefile
@@ -22,11 +22,15 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=README.md
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
+HOST_BUILD_DEPENDS:=python/host
+include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include ../python-package.mk
+include ../python-host.mk
include ../python3-package.mk
PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+HOST_UNPACK=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
define Package/python-ply/Default
SECTION:=lang
@@ -60,6 +64,15 @@ $(call Package/python-ply/description)
(Variant for Python3)
endef
+define Host/Compile
+$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
+endef
+
+define Host/Install
+endef
+
+$(eval $(call HostBuild))
+
$(eval $(call PyPackage,python-ply))
$(eval $(call BuildPackage,python-ply))
$(eval $(call BuildPackage,python-ply-src))
--
2.19.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment