1 files changed, 29 insertions, 13 deletions

diff --git a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
index 1d988182e7..9131d70be6 100644
--- a/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
+++ b/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
@@ -1,3 +1,6 @@
+From 8ca6b0c72b6b933642ec7c4ebb83734244fec46f Mon Sep 17 00:00:00 2001
+From: "Song.Li" <Song.Li@windriver.com>
+Date: Tue, 5 Sep 2017 10:24:10 +0800
 Subject: [PATCH] remove some checks for cross-compiling
 
 some lib check is not suitable for
@@ -8,15 +11,16 @@ Upstream-Status: Inappropriate [not a real bug,just for cross-compiling]
 Signed-off-by: Song.Li <Song.Li@windriver.com>
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+
 ---
- configure.ac | 66 +++++++-----------------------------------------------------
- 1 file changed, 7 insertions(+), 59 deletions(-)
+ configure.ac | 80 +++++-----------------------------------------------
+ 1 file changed, 7 insertions(+), 73 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index df5ad7a..b72bd4c 100644
+index 7f79563..00b359e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -46,57 +46,19 @@ AC_ARG_WITH(iodbc, [  --with-iodbc[[=DIR]]    [[default=no]] DIR is the iODBC bas
+@@ -57,71 +57,20 @@ AC_ARG_WITH(iodbc, [  --with-iodbc[[=DIR]]    [[default=no]] DIR is the iODBC bas
  if test "$with_iodbc" != no; then
         with_unixodbc=no
         AC_DEFINE(WITH_IODBC, 1, [Define to 1 to build with iODBC support])
@@ -34,6 +38,7 @@ index df5ad7a..b72bd4c 100644
 -       fi
  fi
  
+ wo_odbc_config=__without_odbc_config
  if test "$with_unixodbc" != no; then
         AC_DEFINE(WITH_UNIXODBC, 1,
              [Define to 1 to build with unixODBC support])
@@ -42,7 +47,9 @@ index df5ad7a..b72bd4c 100644
 -       else
 -               ODBC_CONFIG=$with_unixodbc
 -       fi
--       if test ! -x "${ODBC_CONFIG}/bin/odbc_config"; then
+-       if test "${ODBC_CONFIG}" = "${wo_odbc_config}"; then
+-               :
+-       elif test ! -x "${ODBC_CONFIG}/bin/odbc_config"; then
 -               if test ! -x "${ODBC_CONFIG}"; then
 -                       AC_MSG_ERROR([odbc_config not found (required for unixODBC build)])
 -               fi
@@ -62,22 +69,33 @@ index df5ad7a..b72bd4c 100644
 -               # Linking libiodoc is rather problematic
 -               [ODBC_LIBDIR=`${ODBC_CONFIG} --libs | sed -e "s/^\(-L\|.*[ \t]-L\)\([^ \n\r\f\t]*\).*$/-L\2/"`]
 -               LDFLAGS="$LDFLAGS ${ODBC_LIBDIR}"
+-               LIBODBC=`${ODBC_CONFIG} --libs` # for regression test
+-       elif test "${ODBC_CONFIG}" = "${wo_odbc_config}"; then
+-               ODBC_INCLUDE=/usr/include
+-               CPPFLAGS="$CPPFLAGS -I${ODBC_INCLUDE}"
+-               ODBC_LIBDiR=""
+-               LIBODBC="-lodbc"        # for regression test
 -       else
 -               ODBC_INCLUDE=`${ODBC_CONFIG} --include-prefix`
 -               CPPFLAGS="$CPPFLAGS -I${ODBC_INCLUDE}"
--               # Linking libodoc is rather problematic
+-               # Linking libodbc is rather problematic
 -               ODBC_LIBDIR=`${ODBC_CONFIG} --lib-prefix`
--               LDFLAGS="$LDFLAGS -L${ODBC_LIBDIR}"
+-               if test "${ODBC_LIBDIR}" != ""; then
+-                       LDFLAGS="$LDFLAGS -L${ODBC_LIBDIR}"
+-               fi
+-               LIBODBC=`${ODBC_CONFIG} --libs` # for regression test
 -       fi
 -       AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBDIR])
+-       AC_MSG_NOTICE([using $LIBODBC for regression test])
 -fi
+-AC_SUBST(LIBODBC)
 +ODBC_LIBS="-lodbcinst"
 +LIBS="$LIBS ${ODBC_LIBS}"
 +AC_MSG_NOTICE([using $ODBC_INCLUDE $ODBC_LIBS])
  
  #
  # SQLCOLATTRIBUTE_SQLLEN check
-@@ -176,18 +138,10 @@ PGAC_ARG_BOOL(enable, pthreads, yes,
+@@ -190,19 +139,10 @@ PGAC_ARG_BOOL(enable, pthreads, yes,
  # Find libpq headers and libraries
  #
  
@@ -87,8 +105,9 @@ index df5ad7a..b72bd4c 100644
 -
 -if test -n "$PG_CONFIG"; then
 -  pg_includedir=`"$PG_CONFIG" --includedir`
+-  pg_pkg_includedir=`"$PG_CONFIG" --pkgincludedir`
 -  pg_libdir=`"$PG_CONFIG" --libdir`
--  CPPFLAGS="$CPPFLAGS -I$pg_includedir"
+-  CPPFLAGS="$CPPFLAGS -I$pg_includedir -I$pg_pkg_includedir/internal"
 -  LDFLAGS="$LDFLAGS -L$pg_libdir"
 -fi
 -
@@ -100,7 +119,7 @@ index df5ad7a..b72bd4c 100644
  
  # 1. Programs
  
-@@ -211,12 +165,6 @@ if test "$with_iodbc" != no; then
+@@ -226,12 +166,6 @@ if test "$with_iodbc" != no; then
                   [AC_MSG_ERROR([iODBC library "iodbcinst" not found])])
  fi
  
@@ -113,6 +132,3 @@ index df5ad7a..b72bd4c 100644
  AC_CHECK_LIB(pq, PQsetSingleRowMode, [],
               [AC_MSG_ERROR([libpq library version >= 9.2 is required])])
  
--- 
-2.8.1
-