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/python | |
| 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/python')
| -rw-r--r-- | lang/python/Makefile | 26 | ||||
| -rw-r--r-- | lang/python/files/python-host.mk | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile index 02c473769..c333f8e08 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -144,13 +144,13 @@ 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) \ - $(STAGING_DIR)/host/lib/pkgconfig/python.pc \ - $(STAGING_DIR)/host/lib/pkgconfig/python2.pc \ - $(STAGING_DIR)/host/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ + $(HOST_BUILD_PREFIX)/lib/pkgconfig/python.pc \ + $(HOST_BUILD_PREFIX)/lib/pkgconfig/python2.pc \ + $(HOST_BUILD_PREFIX)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \ @@ -221,20 +221,20 @@ 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) \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" 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/pgen2 + $(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_BUILD_PREFIX)/bin/pgen2 endef $(eval $(call HostBuild)) diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 6f7977310..080704bba 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -HOST_PYTHON_DIR:=$(STAGING_DIR)/host +HOST_PYTHON_DIR:=$(HOST_BUILD_PREFIX) HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION) HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION) @@ -13,7 +13,7 @@ HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages HOST_PYTHON_BIN:=$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION) -HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR)/host/$(HOST_PYTHON_PKG_DIR) +HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(HOST_BUILD_PREFIX)/$(HOST_PYTHON_PKG_DIR) define HostPython if [ "$(strip $(3))" == "HOST" ]; then \ @@ -44,7 +44,7 @@ define Build/Compile/HostPyRunHost LDSHARED="$(HOSTCC) -shared" \ CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \ - LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR)/host/lib" \ + LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(HOST_BUILD_PREFIX)/lib" \ _PYTHON_HOST_PLATFORM=linux2 \ $(3) \ , \ |