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

Merge pull request #7595 from cotequeiroz/unixodbc_lib-dir

Browse source 
unixodbc: Fix LIB_PREFIX in host build
This commit is contained in:
Hannu Nyman 2018-12-10 21:19:19 +02:00 committed by GitHub
commit 41712d5904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/unixodbc/Makefile
View file

@ -97,6 +97,8 @@ endef
define Build/InstallDev 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
$(CP) $(PKG_BUILD_DIR)/config.h $(1)/usr/include/unixodbc_ac_config.h
$(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
@ -131,7 +133,9 @@ endef
define Host/Configure define Host/Configure
$(call Host/Configure/Default) $(call Host/Configure/Default)
cp $(PKG_BUILD_DIR)/config.h $(HOST_BUILD_DIR) # copy target autoconf config.h file for host build
cp $(STAGING_DIR)/usr/include/unixodbc_ac_config.h $(HOST_BUILD_DIR)
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 $(PKG_BUILD_DIR)/unixodbc_conf.h $(HOST_BUILD_DIR)
endef endef