mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 06:58:39 +01:00
python, python-*: use default prefix for host install
Also fixes a few incorrect "$(STAGING_DIR_HOST)/host" paths. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
+13
-13
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user