From: Jeffery To Date: Fri, 4 Mar 2016 18:27:25 +0000 (+0800) Subject: python packages: update host install prefix X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F2455%2Fhead;p=feed%2Fpackages.git python packages: update host install prefix Signed-off-by: Jeffery To --- diff --git a/lang/python-cffi/Makefile b/lang/python-cffi/Makefile index a0763e0f1e..3b76fddb33 100644 --- a/lang/python-cffi/Makefile +++ b/lang/python-cffi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cffi PKG_VERSION:=1.5.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://pypi.python.org/packages/source/c/cffi @@ -45,7 +45,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="/usr" --root="$(STAGING_DIR)/host") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host") endef define Host/Install diff --git a/lang/python-ply/Makefile b/lang/python-ply/Makefile index 5f1a95dd3c..c92de2edfc 100644 --- a/lang/python-ply/Makefile +++ b/lang/python-ply/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ply PKG_VERSION:=3.8 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.dabeaz.com/ply @@ -45,15 +45,8 @@ define Build/Compile $(call Build/Compile/PyMod,,install --prefix="/usr" --root="$(PKG_INSTALL_DIR)") endef -define Build/InstallDev - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="/usr" --root="$(STAGING_DIR)/host") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host") endef define Host/Install diff --git a/lang/python-pycparser/Makefile b/lang/python-pycparser/Makefile index b657cd8194..8acab48f00 100644 --- a/lang/python-pycparser/Makefile +++ b/lang/python-pycparser/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pycparser PKG_VERSION:=2.14 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://pypi.python.org/packages/source/p/pycparser @@ -47,7 +47,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="/usr" --root="$(STAGING_DIR)/host") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR)/host") endef define Host/Install diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile index 880dd0ba84..141e9a500d 100644 --- a/lang/python-setuptools/Makefile +++ b/lang/python-setuptools/Makefile @@ -1,15 +1,15 @@ # -# Copyright (C) 2014 OpenWrt.org +# Copyright (C) 2014-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. -# +# include $(TOPDIR)/rules.mk PKG_NAME:=python-setuptools PKG_VERSION:=19.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=setuptools-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://pypi.python.org/packages/source/s/setuptools/ @@ -60,7 +60,7 @@ endef define Host/Compile $(call Build/Compile/HostPyMod,,\ - install --root="$(STAGING_DIR)/host" --prefix="/usr" \ + install --root="$(STAGING_DIR)/host" --prefix="" \ --single-version-externally-managed \ ) endef