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

python,python3: Move python-config to $(STAGING_DIR)/host

Browse source 
Build/InstallDev is passed a second argument, a path where host binaries
should be placed (ultimately $(STAGING_DIR)/host).

This change moves python[3]-config to that directory.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2019-06-09 14:05:55 +08:00
parent 1c4b6fef5f
commit 64959a1dd0
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/python/python/Makefile
View file

@ -205,7 +205,7 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(2)/bin
$(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)-openwrt $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)-openwrt
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
@ -219,10 +219,11 @@ define Build/InstallDev
$(1)/usr/lib/pkgconfig $(1)/usr/lib/pkgconfig
$(INSTALL_BIN) \ $(INSTALL_BIN) \
./files/python-config.in \ ./files/python-config.in \
$(1)/usr/bin/python$(PYTHON_VERSION)-config $(2)/bin/python$(PYTHON_VERSION)-config
$(SED) \ $(SED) \
's|@EXENAME@|$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION)|' \ 's|@EXENAME@|$(HOST_PYTHON_DIR)/bin/python$(PYTHON_VERSION)|' \
$(1)/usr/bin/python$(PYTHON_VERSION)-config -e 's|@TARGET_PREFIX@|$(PYTHON_DIR)|' \
$(2)/bin/python$(PYTHON_VERSION)-config
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py \
$(1)/usr/lib/python$(PYTHON_VERSION)-openwrt/_sysconfigdatatarget.py $(1)/usr/lib/python$(PYTHON_VERSION)-openwrt/_sysconfigdatatarget.py

3
lang/python/python/files/python-config.in
View file

@ -8,8 +8,7 @@ from distutils import sysconfig
# start changes # start changes
host_prefix = sysconfig.PREFIX host_prefix = sysconfig.PREFIX
target_bin_dir = os.path.dirname(os.path.abspath(__file__)) target_prefix = '@TARGET_PREFIX@'
target_prefix = os.path.normpath(os.path.join(target_bin_dir, '..'))
target_data_dir = os.path.join(target_prefix, 'lib', 'python' + sysconfig.get_config_var('VERSION') + '-openwrt') target_data_dir = os.path.join(target_prefix, 'lib', 'python' + sysconfig.get_config_var('VERSION') + '-openwrt')
sys.path.append(target_data_dir) sys.path.append(target_data_dir)

7
lang/python/python3/Makefile
View file

@ -209,7 +209,7 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(2)/bin
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
$(1)/usr/include/ $(1)/usr/include/
@ -222,7 +222,10 @@ define Build/InstallDev
$(1)/usr/lib/pkgconfig $(1)/usr/lib/pkgconfig
$(INSTALL_BIN) \ $(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/python$(PYTHON_VERSION)-config \ $(PKG_INSTALL_DIR)/usr/bin/python$(PYTHON_VERSION)-config \
$(1)/usr/bin/ $(2)/bin/
$(SED) \
's|^prefix_real=.*$$$$|prefix_real="$(PYTHON3_DIR)"|' \
$(2)/bin/python$(PYTHON_VERSION)-config
endef endef
PYTHON3_BASE_LIB_FILES:= \ PYTHON3_BASE_LIB_FILES:= \