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

unixodbc: fix host build

Browse source 
Fixed #4705

Reported-by: Michael Braun <michael-dev@fami-braun.de>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2017-08-30 19:27:40 +02:00
parent da11ac80ec
commit b8f0e2ca38
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libs/unixodbc/Makefile
View file

@ -9,16 +9,24 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unixodbc PKG_NAME:=unixodbc
PKG_VERSION:=2.3.4 PKG_VERSION:=2.3.4
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE_URL:=ftp://ftp.unixodbc.org/pub/unixODBC/ PKG_SOURCE_URL:=ftp://ftp.unixodbc.org/pub/unixODBC/
PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz
PKG_HASH:=2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39 PKG_HASH:=2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39
PKG_BUILD_DIR:=$(BUILD_DIR)/unixODBC-$(PKG_VERSION) 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_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
PKG_LICENSE:=prog GPL libs LGPL 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)/package.mk
include $(INCLUDE_DIR)/host-build.mk
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-gui \ --disable-gui \
--with-pic \ --with-pic \
@ -74,12 +82,6 @@ define Build/Compile
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
ARCH="$(ARCH)" \ ARCH="$(ARCH)" \
CC="$(TARGET_CC)" 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) \ $(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
@ -88,10 +90,6 @@ define Build/Compile
endef endef
define Build/InstallDev 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 $(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/
$(INSTALL_DIR) $(1)/usr/lib $(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 echo "Driver = /usr/lib/libodbcpsql.so" >> $(1)/etc/odbcinst.ini.d/pgsqlodbc.ini
endef 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))
$(eval $(call BuildPackage,unixodbc-tools)) $(eval $(call BuildPackage,unixodbc-tools))
$(eval $(call BuildPackage,pgsqlodbc)) $(eval $(call BuildPackage,pgsqlodbc))
$(eval $(call HostBuild))