components/unixodbc/patches/000-configure.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 16 Feb 2017 08:04:08 -0800
changeset 7671 a092c6b08fcc
parent 1042 31d26adcf615
permissions -rw-r--r--
PSARC 2016/644 unixODBC version 2.3.4 23210080 Upgrade unixodbc to 2.3.4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     1
Changes to the configure program from a previous engineer.
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     2
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     3
Further work (including patching against configure.ac instead of configure)
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     4
needs to be done to determine if they are really essential and if they need
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     5
to be sent upstream.
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     6
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     7
--- configure.orig	2016-12-19 13:45:11.806909920 +0000
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     8
+++ configure	2016-12-19 13:51:48.756972474 +0000
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
     9
@@ -874,7 +874,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
 datadir='${datarootdir}'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
 sysconfdir='${prefix}/etc'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
 sharedstatedir='${prefix}/com'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    13
-localstatedir='${prefix}/var'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
+localstatedir='/var'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
 includedir='${prefix}/include'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
 oldincludedir='/usr/include'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    17
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    18
@@ -15598,6 +15598,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
 int
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    20
 main ()
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
 {
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
+#error "We want to use libpthread and not libthread."
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
 mutex_lock()
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
   ;
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
   return 0;
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    26
@@ -15687,7 +15688,7 @@
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    27
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    28
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    29
 $as_echo "yes" >&6; }
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    30
-  CFLAGS="$CFLAGS -pthread"
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    31
+  CFLAGS="$CFLAGS"
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    32
 else
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    33
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    34
 $as_echo "no" >&6; }
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    35
@@ -15760,7 +15761,7 @@
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    36
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    37
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    38
 $as_echo "yes" >&6; }
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    39
-  CFLAGS="$CFLAGS -pthread"
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    40
+  CFLAGS="$CFLAGS"
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    41
 else
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    42
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    43
 $as_echo "no" >&6; }
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    44
@@ -15798,7 +15799,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    45
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    46
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    47
 $as_echo "yes" >&6; }
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    48
-  CFLAGS="$CFLAGS -pthread"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    49
+  CFLAGS="$CFLAGS"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    50
 else
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    51
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    52
 $as_echo "no" >&6; }
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    53
@@ -15838,7 +15839,7 @@
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    54
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    55
           $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    56
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    57
-          THREADLIB="-pthread -lc_r"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    58
+          THREADLIB="-lpthread -lposix4"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    59
           gotthread="yes";
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    60
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    61
 else
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    62
@@ -15851,7 +15852,7 @@
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    63
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    64
         if test "x$gotthread" = "xno"; then
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    65
       SAVECFLAGS="$CFLAGS"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    66
-      CFLAGS="$CFLAGS -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    67
+      CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    68
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    69
 $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    70
 ac_save_LIBS="$LIBS"
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    71
@@ -16048,6 +16049,8 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    72
 
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    73
 fi
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    74
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    75
+export drivers="true"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    76
+export driverc="true"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    77
 
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    78
 # Check whether --with-msql-lib was given.
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    79
 if test "${with_msql_lib+set}" = set; then :
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    80
@@ -16265,6 +16268,8 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    81
   QNX_FALSE=
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    82
 fi
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    83
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    84
+export use_builtin_libtool="no"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    85
+
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    86
  if test "x$use_builtin_libtool" = "xyes" ; then
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    87
   WITHLT_TRUE=
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    88
   WITHLT_FALSE='#'
7671
a092c6b08fcc PSARC 2016/644 unixODBC version 2.3.4
Rich Burridge <rich.burridge@oracle.com>
parents: 1042
diff changeset
    89
@@ -16815,6 +16820,8 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    90
 fi
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    91
 done
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    92
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    93
+export LIBS="${LIBS} -lsocket -lnsl -lgen -z ignore"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    94
+export LD_OPTIONS="-lsocket -lnsl -lgen -z ignore"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    95
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    96
 for ac_func in putenv socket strdup strstr setenv setlocale strchr
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    97
 do :