diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2016-10-27 16:43:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 16:43:15 +0300 |
| commit | 265f9595ed5fc57c867e5ef0e4de7bdbed727a98 (patch) | |
| tree | 38396d13af6caac574a87cc06ecd8fa51d45cea8 /lang/python3 | |
| parent | 172c50c4b127a58529f8982061bafd2add325d13 (diff) | |
| parent | b53342b9a436cbd2d0a0c7a6ed3cf538b5e1e3e4 (diff) | |
Merge pull request #3297 from NeoRaider/python
python, python3, python-*: use default prefix for host install
Diffstat (limited to 'lang/python3')
| -rw-r--r-- | lang/python3/Makefile | 23 | ||||
| -rw-r--r-- | lang/python3/files/python3-package.mk | 4 |
2 files changed, 14 insertions, 13 deletions
diff --git a/lang/python3/Makefile b/lang/python3/Makefile index d0b5b5eae..2463f92a0 100644 --- a/lang/python3/Makefile +++ b/lang/python3/Makefile @@ -146,7 +146,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ $(CP) \ - $(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \ + $(HOST_BUILD_PREFIX)/lib/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ @@ -216,13 +216,13 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --prefix=$(STAGING_DIR)/host \ - --exec-prefix=$(STAGING_DIR)/host \ - --sysconfdir=$(STAGING_DIR_HOST)/host/etc \ - --localstatedir=$(STAGING_DIR)/host/var \ - --sbindir=$(STAGING_DIR)/host/bin \ - --with-system-expat=$(STAGING_DIR)/host \ - --with-system-ffi=$(STAGING_DIR)/host \ + --prefix=$(HOST_BUILD_PREFIX) \ + --exec-prefix=$(HOST_BUILD_PREFIX) \ + --sysconfdir=$(HOST_BUILD_PREFIX)/etc \ + --localstatedir=$(HOST_BUILD_PREFIX)/var \ + --sbindir=$(HOST_BUILD_PREFIX)/bin \ + --with-system-expat=$(HOST_BUILD_PREFIX) \ + --with-system-ffi=$(HOST_BUILD_PREFIX) \ --with-ensurepip=upgrade \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" @@ -233,10 +233,11 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(MAKE) -C $(HOST_BUILD_DIR) install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen3 - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR)/host/bin/_freeze_importlib + + $(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_BUILD_PREFIX)/bin/pgen3 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(HOST_BUILD_PREFIX)/bin/_freeze_importlib endef $(eval $(call HostBuild)) diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk index 3d0413c1c..d2697d9d4 100644 --- a/lang/python3/files/python3-package.mk +++ b/lang/python3/files/python3-package.mk @@ -20,8 +20,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages PYTHON3:=python$(PYTHON3_VERSION) -HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR)/host/lib/python$(PYTHON3_VERSION) -HOST_PYTHON3_BIN:=$(STAGING_DIR)/host/bin/python3 +HOST_PYTHON3_LIB_DIR:=$(HOST_BUILD_PREFIX)/lib/python$(PYTHON3_VERSION) +HOST_PYTHON3_BIN:=$(HOST_BUILD_PREFIX)/bin/python3 PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) define HostPython3 |