unixodbc: fix host build

Fixed #4705

Reported-by: Michael Braun <michael-dev@fami-braun.de>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/libs/unixodbc/Makefile b/libs/unixodbc/Makefile
index a9b8eecbcf604ef80ba6e20b69cdab7619e9e225..6a1ca0dffdd63e6addc9b7bcbe38b9759ea9be78 100644 (file)
--- a/libs/unixodbc/Makefile
+++ b/libs/unixodbc/Makefile
@@ -9,16 +9,24 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=unixodbc
 PKG_VERSION:=2.3.4
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE_URL:=ftp://ftp.unixodbc.org/pub/unixODBC/
 PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz
 PKG_HASH:=2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39
 PKG_BUILD_DIR:=$(BUILD_DIR)/unixODBC-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/unixODBC-$(PKG_VERSION)
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 PKG_LICENSE:=prog GPL libs LGPL
+HOST_BUILD_DEPENDS:=unixodbc
+
+# if your other package depends on unixodbc and needs
+# odbc_config, add to your other Makefile
+#  PKG_BUILD_DEPENDS:=unixodbc/host
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
 CONFIGURE_ARGS += \
        --disable-gui \
        --with-pic \
@@ -74,12 +82,6 @@ define Build/Compile
                $(MAKE_FLAGS) \
                ARCH="$(ARCH)" \
                CC="$(TARGET_CC)"
-       rm $(PKG_BUILD_DIR)/exe/{odbc_config,odbc-config.o}
-       $(MAKE) -C $(PKG_BUILD_DIR)/exe \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               CC="$(HOSTCC)" \
-               CFLAGS="$(HOST_CFLAGS) -DUSE_UNIXODBC_CONF_H" \
-               LDFLAGS="$(HOST_LDFLAGS)"
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                $(MAKE_FLAGS) \
@@ -88,10 +90,6 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/host/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/odbc_config $(1)/host/bin
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(LN) ../../host/bin/odbc_config $(1)/usr/bin
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/$(STAGING_DIR)/usr/include/*.h $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
@@ -126,6 +124,27 @@ define Package/pgsqlodbc/install
        echo "Driver = /usr/lib/libodbcpsql.so" >> $(1)/etc/odbcinst.ini.d/pgsqlodbc.ini
 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)
+endef
+
+define Host/Compile
+       $(MAKE) -C $(HOST_BUILD_DIR)/exe \
+               DESTDIR="$(HOST_INSTALL_DIR)" \
+               CC="$(HOSTCC)" \
+               CFLAGS="$(HOST_CFLAGS) -DUSE_UNIXODBC_CONF_H" \
+               LDFLAGS="$(HOST_LDFLAGS)" \
+               odbc_config
+endef
+
+define Host/Install
+       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+       $(CP) $(HOST_BUILD_DIR)/exe/odbc_config $(STAGING_DIR_HOST)/bin
+endef
+
 $(eval $(call BuildPackage,unixodbc))
 $(eval $(call BuildPackage,unixodbc-tools))
 $(eval $(call BuildPackage,pgsqlodbc))
+$(eval $(call HostBuild))