Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python,python3: install mk files in the Host/Install phase

Browse source 
The Build/InstallDev rule is activated only for target builds.
But if someone needs only the host Python, then
these files need to be installed in this phase, and not Build/InstallDev

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2017-06-29 14:03:51 +03:00
parent 919b9bc41a
commit e88e35249f
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lang/python/python/Makefile
View file

@ -188,7 +188,6 @@ define Build/Compile
endef
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/mk/
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/ $(1)/usr/lib/pkgconfig
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
$(INSTALL_DATA) \
@ -292,8 +291,18 @@ HOST_CONFIGURE_ARGS+= \
define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install
$(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/
$(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/ $(STAGING_DIR)/mk/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2
# Install these mk files in the Host/Install phase ;
# The Build/InstallDev rule is activated only for target builds.
# But if someone needs only the host Python, then
# these files need to be installed in this phase, and not Build/InstallDev
$(INSTALL_DATA) \
./files/python-package.mk \
./files/python-host.mk \
./files/python-version.mk \
./files/python-package-install.sh \
$(STAGING_DIR)/mk/
endef
$(eval $(call HostBuild))

20
lang/python/python3/Makefile
View file

@ -182,15 +182,8 @@ define Build/Compile
endef
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/mk/
$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
$(INSTALL_DATA) \
./files/python3-package.mk \
./files/python3-host.mk \
./files/python3-version.mk \
./files/python3-package-install.sh \
$(STAGING_DIR)/mk/
$(CP) \
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
$(1)/usr/include/
@ -279,9 +272,20 @@ endef
define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install
$(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/
$(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/ $(STAGING_DIR)/mk/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON3_DIR)/bin/pgen3
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(HOST_PYTHON3_DIR)/bin/_freeze_importlib
# Install these mk files in the Host/Install phase ;
# The Build/InstallDev rule is activated only for target builds.
# But if someone needs only the host Python, then
# these files need to be installed in this phase, and not Build/InstallDev
$(INSTALL_DATA) \
./files/python3-package.mk \
./files/python3-host.mk \
./files/python3-version.mk \
./files/python3-package-install.sh \
$(STAGING_DIR)/mk/
endef
$(eval $(call HostBuild))