Merge pull request #8719 from neheb/unix

[18.06] unixodbc: Fix compilation
This commit is contained in:
Rosen Penev 2019-04-22 12:18:34 -07:00 committed by GitHub
commit 03a4afe5f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -92,6 +92,11 @@ endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/$(STAGING_DIR)/usr/include/*.h $(1)/usr/include/
# Save autoconf config.h file for host build
# 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
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/etc
@ -126,8 +131,9 @@ endef
define Host/Configure
$(call Host/Configure/Default)
cp $(PKG_BUILD_DIR)/config.h $(HOST_BUILD_DIR)
cp $(PKG_BUILD_DIR)/unixodbc_conf.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
cp $(STAGING_DIR)/tmp/unixodbc/unixodbc_conf.h $(HOST_BUILD_DIR)
endef
define Host/Compile