diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2016-11-04 11:00:07 +0200 |
|---|---|---|
| committer | Alexandru Ardelean <ardeleanalex@gmail.com> | 2016-11-07 10:55:34 +0200 |
| commit | 9eca45fdf16bcf8237102663fe7c91795687929d (patch) | |
| tree | 85bc67a95b8e11f5595e3730e6cb6235033905d6 /lang/python | |
| parent | 7d89234b86df46b4a11fbf35fba8e5102396b539 (diff) | |
python, python3: unify HOST_ vars and get rid of HOST_CFLAGS
--sysconfigdir and --sbindir are obtained from --prefix
and --exec-prefix, so no need to have them explicitly
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/Makefile | 23 | ||||
| -rw-r--r-- | lang/python/files/python-host.mk | 4 |
2 files changed, 12 insertions, 15 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile index 3235b4557..3eb4e9dad 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -151,13 +151,13 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(1)/usr/include/ $(CP) \ - $(HOST_BUILD_PREFIX)/lib/python$(PYTHON_VERSION) \ + $(HOST_PYTHON_LIB_DIR) \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(1)/usr/lib/ $(CP) \ - $(HOST_BUILD_PREFIX)/lib/pkgconfig/python.pc \ - $(HOST_BUILD_PREFIX)/lib/pkgconfig/python2.pc \ - $(HOST_BUILD_PREFIX)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ + $(HOST_PYTHON_DIR)/lib/pkgconfig/python.pc \ + $(HOST_PYTHON_DIR)/lib/pkgconfig/python2.pc \ + $(HOST_PYTHON_DIR)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \ $(1)/usr/lib/pkgconfig $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \ @@ -224,20 +224,17 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --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) \ + --prefix=$(HOST_PYTHON_DIR) \ + --exec-prefix=$(HOST_PYTHON_DIR) \ + --with-system-expat=$(STAGING_DIR_HOSTPKG) \ + --with-system-ffi=$(STAGING_DIR_HOSTPKG) \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install - $(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_BUILD_PREFIX)/bin/pgen2 + $(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2 endef $(eval $(call HostBuild)) diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 21f238fe0..dc0c0c049 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -21,11 +21,11 @@ HOST_PYTHON_DIR:=$(STAGING_DIR_HOSTPKG) HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION) HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION) -HOST_PYTHON_PKG_DIR:=/lib/python$(PYTHON_VERSION)/site-packages +HOST_PYTHON_PKG_DIR:=$(HOST_PYTHON_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_HOSTPKG)/$(HOST_PYTHON_PKG_DIR) +HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(HOST_PYTHON_PKG_DIR) define HostPython if [ "$(strip $(3))" == "HOST" ]; then \ |