Browse Source

Merge pull request #7644 from cotequeiroz/unixodbc_save-in-tmp

unixodbc: save unixodbc_conf.h for host build
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
06b2dcd752
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      libs/unixodbc/Makefile

+ 6
- 4
libs/unixodbc/Makefile View File

@ -98,7 +98,10 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/$(STAGING_DIR)/usr/include/*.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/$(STAGING_DIR)/usr/include/*.h $(1)/usr/include/
# Save autoconf config.h file for host build # Save autoconf config.h file for host build
$(CP) $(PKG_BUILD_DIR)/config.h $(1)/usr/include/unixodbc_ac_config.h
# copy target autoconf config.h and unixodbc_conf.h file for host build
$(INSTALL_DIR) $(1)/tmp/unixodbc
$(CP) $(PKG_BUILD_DIR)/config.h $(1)/tmp/unixodbc/
$(CP) $(PKG_BUILD_DIR)/unixodbc_conf.h $(1)/tmp/unixodbc/
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
@ -133,10 +136,9 @@ endef
define Host/Configure define Host/Configure
$(call Host/Configure/Default) $(call Host/Configure/Default)
# copy target autoconf config.h file for host build
cp $(STAGING_DIR)/usr/include/unixodbc_ac_config.h $(HOST_BUILD_DIR)
cp $(STAGING_DIR)/tmp/unixodbc/config.h $(HOST_BUILD_DIR)
sed -i -e 's!\(LIB_PREFIX \).*$$$$!\1"$(STAGING_DIR)/usr/lib"!' $(HOST_BUILD_DIR)/config.h sed -i -e 's!\(LIB_PREFIX \).*$$$$!\1"$(STAGING_DIR)/usr/lib"!' $(HOST_BUILD_DIR)/config.h
cp $(PKG_BUILD_DIR)/unixodbc_conf.h $(HOST_BUILD_DIR)
cp $(STAGING_DIR)/tmp/unixodbc/unixodbc_conf.h $(HOST_BUILD_DIR)
endef endef
define Host/Compile define Host/Compile


Loading…
Cancel
Save