diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2023-10-27 17:51:58 +0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2023-10-30 13:25:58 -0700 |
| commit | 3ab793f09e73e654265a3a6a49bcebef85926690 (patch) | |
| tree | e3bd552eacbfa2a4a1d3ed79ce274dd34d3837b3 /libs | |
| parent | b0699060c91345fdb964a4acbb6e26e77b8046cb (diff) | |
unixodbc: Use default includedir for target configure
Replace INCLUDE_PREFIX in config.h for host odbc_config instead of
specifying includedir to target configure.
This also updates the prefixes in unixodbc_conf.h to keep config.h and
unixodbc_conf.h in sync.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/unixodbc/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libs/unixodbc/Makefile b/libs/unixodbc/Makefile index c3c17b703..4dc5b553b 100644 --- a/libs/unixodbc/Makefile +++ b/libs/unixodbc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=unixodbc PKG_VERSION:=2.3.9 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=unixODBC-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.unixodbc.org @@ -36,8 +36,7 @@ include $(INCLUDE_DIR)/host-build.mk CONFIGURE_ARGS += \ --disable-gui \ --with-pic \ - --enable-drivers \ - --includedir=$(STAGING_DIR)/usr/include + --enable-drivers define Package/unixodbc/Default SUBMENU:=Database @@ -84,7 +83,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/$(STAGING_DIR)/usr/include/*.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_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)/usr/include/unixodbc @@ -123,9 +122,12 @@ endef define Host/Configure $(call Host/Configure/Default) - cp $(STAGING_DIR)/usr/include/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)/usr/include/unixodbc/unixodbc_conf.h $(HOST_BUILD_DIR) + $(CP) $(STAGING_DIR)/usr/include/unixodbc/config.h $(HOST_BUILD_DIR) + $(CP) $(STAGING_DIR)/usr/include/unixodbc/unixodbc_conf.h $(HOST_BUILD_DIR) + $(SED) 's!^#define INCLUDE_PREFIX ".*"!#define INCLUDE_PREFIX "$(STAGING_DIR)/usr/include"!' \ + -e 's!^#define LIB_PREFIX ".*"!#define LIB_PREFIX "$(STAGING_DIR)/usr/lib"!' \ + $(HOST_BUILD_DIR)/config.h \ + $(HOST_BUILD_DIR)/unixodbc_conf.h endef define Host/Compile |