Ticket #32501: erlang-portfile-odbc-linking-fix.patch

File erlang-portfile-odbc-linking-fix.patch, 3.1 KB (added by chad@…, 12 years ago)

Adds patches for ODBC configure scripts when +odbc variant is invoked.

  • Portfile 

    diff --git a/Portfile b/Portfile
index 0511b69..196af8c 100644
    a b variant nohipe description {Disable HiPE (native-code bytecode compiler)} { 
    165165}
    166166
    167167variant odbc description {Build ODBC support} {
     168    patchfiles-append        patch-lib_odbc_configure.in \
     169                             patch-lib_odbc_configure
    168170    depends_lib-append             port:unixODBC
    169171    configure.args-delete   --without-odbc
    170172    configure.args-append   --with-odbc=${prefix}

  • new file files/patch-lib_odbc_configure 

    diff --git a/files/patch-lib_odbc_configure b/files/patch-lib_odbc_configure
new file mode 100644
index 0000000..2a1e8f4
    - +  
     1--- lib/odbc/configure.orig
     2+++ lib/odbc/configure
     3@@ -5107,13 +5107,13 @@ odbc_lib_link_success=no
     4                    ODBC_INCLUDE="-I$with_odbc/include"
     5                fi
     6 
     7-               echo "$as_me:$LINENO: checking for SQLAllocHandle in -liodbc" >&5
     8-echo $ECHO_N "checking for SQLAllocHandle in -liodbc... $ECHO_C" >&6
     9-if test "${ac_cv_lib_iodbc_SQLAllocHandle+set}" = set; then
     10+               echo "$as_me:$LINENO: checking for SQLAllocHandle in -lodbc" >&5
     11+echo $ECHO_N "checking for SQLAllocHandle in -lodbc... $ECHO_C" >&6
     12+if test "${ac_cv_lib_odbc_SQLAllocHandle+set}" = set; then
     13   echo $ECHO_N "(cached) $ECHO_C" >&6
     14 else
     15   ac_check_lib_save_LIBS=$LIBS
     16-LIBS="-liodbc  $LIBS"
     17+LIBS="-lodbc  $LIBS"
     18 cat >conftest.$ac_ext <<_ACEOF
     19 /* confdefs.h.  */
     20 _ACEOF
     21@@ -5158,21 +5158,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     22   ac_status=$?
     23   echo "$as_me:$LINENO: \$? = $ac_status" >&5
     24   (exit $ac_status); }; }; then
     25-  ac_cv_lib_iodbc_SQLAllocHandle=yes
     26+  ac_cv_lib_odbc_SQLAllocHandle=yes
     27 else
     28   echo "$as_me: failed program was:" >&5
     29 sed 's/^/| /' conftest.$ac_ext >&5
     30 
     31-ac_cv_lib_iodbc_SQLAllocHandle=no
     32+ac_cv_lib_odbc_SQLAllocHandle=no
     33 fi
     34 rm -f conftest.err conftest.$ac_objext \
     35       conftest$ac_exeext conftest.$ac_ext
     36 LIBS=$ac_check_lib_save_LIBS
     37 fi
     38-echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocHandle" >&5
     39-echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocHandle" >&6
     40-if test $ac_cv_lib_iodbc_SQLAllocHandle = yes; then
     41-  ODBC_LIB="$ODBC_LIB -liodbc"; odbc_lib_link_success=yes
     42+echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocHandle" >&5
     43+echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocHandle" >&6
     44+if test $ac_cv_lib_odbc_SQLAllocHandle = yes; then
     45+  ODBC_LIB="$ODBC_LIB -lodbc"; odbc_lib_link_success=yes
     46 fi
     47 
     48             ;;

  • new file files/patch-lib_odbc_configure.in 

    diff --git a/files/patch-lib_odbc_configure.in b/files/patch-lib_odbc_configure.in
new file mode 100644
index 0000000..3ba4720
    - +  
     1--- lib/odbc/configure.in.orig
     2+++ lib/odbc/configure.in
     3@@ -154,7 +154,7 @@ AC_SUBST(TARGET_FLAGS)
     4                    ODBC_INCLUDE="-I$with_odbc/include"
     5                fi
     6                           
     7-               AC_CHECK_LIB(iodbc, SQLAllocHandle,[ODBC_LIB="$ODBC_LIB -liodbc"; odbc_lib_link_success=yes])
     8+               AC_CHECK_LIB(odbc, SQLAllocHandle,[ODBC_LIB="$ODBC_LIB -lodbc"; odbc_lib_link_success=yes])
     9             ;;
     10         win32|cygwin)
     11                TARGET_FLAGS="-DWIN32"