Browse Source

Merge pull request #16326 from cotequeiroz/install_host

perlmod.mk, unixodbc: use 'install' instead of 'cp' to install host binaries to avoid "Text file busy" error.
lilik-openwrt-22.03
Rosen Penev 3 years ago
committed by GitHub
parent
commit
51f9a12a54
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      lang/perl/perlmod.mk
  2. +2
    -2
      libs/unixodbc/Makefile

+ 2
- 2
lang/perl/perlmod.mk View File

@ -35,8 +35,8 @@ PERLMOD_TESTSDIR:=/usr/share/perl/perlmod-tests
define perlmod/host/relink define perlmod/host/relink
rm -f $(1)/Makefile.aperl rm -f $(1)/Makefile.aperl
$(MAKE) -C $(1) perl $(MAKE) -C $(1) perl
$(CP) $(1)/perl $(PERL_CMD)
$(CP) $(1)/perl $(STAGING_DIR_HOSTPKG)/usr/bin/perl
$(INSTALL_BIN) $(1)/perl $(PERL_CMD)
$(INSTALL_BIN) $(1)/perl $(STAGING_DIR_HOSTPKG)/usr/bin/perl
endef endef
define perlmod/host/Configure define perlmod/host/Configure


+ 2
- 2
libs/unixodbc/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unixodbc PKG_NAME:=unixodbc
PKG_VERSION:=2.3.9 PKG_VERSION:=2.3.9
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.unixodbc.org PKG_SOURCE_URL:=http://www.unixodbc.org
@ -152,7 +152,7 @@ endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
$(CP) $(HOST_BUILD_DIR)/exe/odbc_config $(STAGING_DIR_HOST)/bin
$(INSTALL_BIN) $(HOST_BUILD_DIR)/exe/odbc_config $(STAGING_DIR_HOST)/bin
endef endef
$(eval $(call BuildPackage,unixodbc)) $(eval $(call BuildPackage,unixodbc))


Loading…
Cancel
Save