--- a/components/unixodbc/patches/000-configure.patch Fri Jun 12 13:46:55 2015 -0700
+++ b/components/unixodbc/patches/000-configure.patch Tue Jun 16 08:01:42 2015 -0700
@@ -1,12 +1,12 @@
---- configure 2010-02-23 07:30:55.000000000 -0500
-+++ configure 2010-09-15 13:44:24.854675000 -0400
+--- configure 2011-11-25 08:14:47.000000000 -0800
++++ configure 2012-10-18 12:03:36.047791375 -0700
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.64 for unixODBC 2.3.0.
+ # Generated by GNU Autoconf 2.65 for unixODBC 2.3.1.
#
[email protected]@ -238,7 +238,7 @@
[email protected]@ -240,7 +240,7 @@
fi
fi
fi
@@ -15,7 +15,7 @@
export SHELL
# Unset more variables known to interfere with behavior of common tools.
CLICOLOR_FORCE= GREP_OPTIONS=
[email protected]@ -529,7 +529,7 @@
[email protected]@ -533,7 +533,7 @@
# Check that we are running under the correct shell.
@@ -24,7 +24,7 @@
case X$lt_ECHO in
X*--fallback-echo)
[email protected]@ -613,7 +613,7 @@
[email protected]@ -617,7 +617,7 @@
elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
# If we have ksh, try running configure again with it.
@@ -33,7 +33,7 @@
export ORIGINAL_CONFIG_SHELL
CONFIG_SHELL=/bin/ksh
export CONFIG_SHELL
[email protected]@ -655,7 +655,7 @@
[email protected]@ -659,7 +659,7 @@
if test "$prev" != 'sed 50q "$0"'; then
echo_test_string=`eval $prev`
export echo_test_string
@@ -42,7 +42,7 @@
else
# Oops. We lost completely, so just stick with echo.
ECHO=echo
[email protected]@ -999,7 +999,7 @@
[email protected]@ -1002,7 +1002,7 @@
datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
@@ -51,7 +51,7 @@
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
[email protected]@ -2686,7 +2686,7 @@
[email protected]@ -2689,7 +2689,7 @@
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -59,35 +59,8 @@
+ac_compiler_gnu="no"
- ac_aux_dir=
[email protected]@ -3097,7 +3097,7 @@
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
--SHELL = /bin/sh
-+SHELL = /bin/bash
- all:
- @echo '@@@%%%=$(MAKE)[email protected]@@%%%'
- _ACEOF
[email protected]@ -4153,7 +4153,7 @@
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-+ # Solaris 8's {/usr,}/bin/bash.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
[email protected]@ -4957,7 +4957,7 @@
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-+ # Solaris 8's {/usr,}/bin/bash.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
[email protected]@ -5218,7 +5218,7 @@
+
[email protected]@ -3100,7 +3100,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -96,7 +69,43 @@
all:
@echo '@@@%%%=$(MAKE)[email protected]@@%%%'
_ACEOF
[email protected]@ -6667,7 +6667,7 @@
[email protected]@ -3346,7 +3346,7 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ac_compiler_gnu="no"
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
[email protected]@ -4180,7 +4180,7 @@
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
++ # Solaris 8's {/usr,}/bin/bash.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
[email protected]@ -4984,7 +4984,7 @@
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
++ # Solaris 8's {/usr,}/bin/bash.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
[email protected]@ -5245,7 +5245,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+-SHELL = /bin/sh
++SHELL = /bin/bash
+ all:
+ @echo '@@@%%%=$(MAKE)[email protected]@@%%%'
+ _ACEOF
[email protected]@ -6705,7 +6705,7 @@
for i in 1 2 3 4 5 6 7 8 ; do
teststring=$teststring$teststring
done
@@ -105,7 +114,7 @@
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
[email protected]@ -14651,6 +14651,7 @@
[email protected]@ -14678,6 +14678,7 @@
int
main ()
{
@@ -113,34 +122,7 @@
mutex_lock()
;
return 0;
[email protected]@ -14732,7 +14733,8 @@
- $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
-
- gotthread="yes";
-- THREADLIB="-lpthread"
-+ THREADLIB="-lpthread -lposix4 -lrt"
-+ ac_cv_c_compiler_gnu="no"
- if test "x$ac_cv_c_compiler_gnu"="xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5
- $as_echo_n "checking if compiler accepts -pthread... " >&6; }
[email protected]@ -14740,7 +14742,7 @@
- if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- CFLAGS="$CFLAGS -pthread"
-+ CFLAGS="$CFLAGS"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
[email protected]@ -14806,6 +14808,7 @@
-
- gotthread="yes";
- THREADLIB=""
-+ ac_cv_c_compiler_gnu="no"
- if test "x$ac_cv_c_compiler_gnu"="xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5
- $as_echo_n "checking if compiler accepts -pthread... " >&6; }
[email protected]@ -14813,7 +14816,7 @@
[email protected]@ -14767,7 +14768,7 @@
if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -149,16 +131,16 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
[email protected]@ -14843,6 +14846,8 @@
-
- fi
-
-+ ac_cv_c_compiler_gnu="no"
-+ ac_cv_c_compiler_gnu="no"
- if test "x$gotthread" = "xno"; then
- if test "x$ac_cv_c_compiler_gnu"="xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5
[email protected]@ -14851,7 +14856,7 @@
[email protected]@ -14840,7 +14841,7 @@
+ if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- CFLAGS="$CFLAGS -pthread"
++ CFLAGS="$CFLAGS"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
[email protected]@ -14878,7 +14879,7 @@
if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -167,7 +149,25 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
[email protected]@ -15053,7 +15058,7 @@
[email protected]@ -14918,7 +14919,7 @@
+
+ $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
+
+- THREADLIB="-pthread -lc_r"
++ THREADLIB="-lpthread -lposix4"
+ gotthread="yes";
+
+ else
[email protected]@ -14931,7 +14932,7 @@
+
+ if test "x$gotthread" = "xno"; then
+ SAVECFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
++ CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
+ $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
+ ac_save_LIBS="$LIBS"
[email protected]@ -15080,7 +15081,7 @@
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -176,17 +176,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for semundo union" >&5
[email protected]@ -15287,7 +15292,8 @@
[email protected]@ -15129,6 +15130,8 @@
- done
+ fi
--
+export drivers="true"
+export driverc="true"
- if test "x$msql" = "xtrue" ; then
- MSQL_TRUE=
[email protected]@ -15321,6 +15327,8 @@
+ # Check whether --with-msql-lib was given.
+ if test "${with_msql_lib+set}" = set; then :
[email protected]@ -15348,6 +15351,8 @@
QNX_FALSE=
fi
@@ -195,7 +194,7 @@
if test "x$use_builtin_libtool" = "xyes" ; then
WITHLT_TRUE=
WITHLT_FALSE='#'
[email protected]@ -15873,6 +15881,8 @@
[email protected]@ -15900,6 +15905,8 @@
fi
done
--- a/components/unixodbc/unixodbc.p5m Fri Jun 12 13:46:55 2015 -0700
+++ b/components/unixodbc/unixodbc.p5m Tue Jun 16 08:01:42 2015 -0700
@@ -20,7 +20,7 @@
#
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
set name=pkg.fmri \
value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The UnixODBC Subsystem and SDK"
@@ -35,23 +35,16 @@
set name=org.opensolaris.arc-caseid value=LSARC/2007/684
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-dir path=etc
-dir path=etc/odbc
dir path=etc/odbc/ODBCDataSources
#
file path=etc/odbc/odbc.ini
file path=etc/odbc/odbcinst.ini
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH64)
file path=usr/bin/$(MACH64)/odbc_config
file path=usr/bin/dltest
file path=usr/bin/isql
file path=usr/bin/iusql
file path=usr/bin/odbc_config
file path=usr/bin/odbcinst
-dir path=usr/include
-dir path=usr/include/odbc
file path=usr/include/odbc/odbcinst.h
file path=usr/include/odbc/odbcinstext.h
file path=usr/include/odbc/sql.h
@@ -61,8 +54,6 @@
file path=usr/include/odbc/unixodbc_conf.h
file path=usr/include/odbc/uodbc_extras.h
file path=usr/include/odbc/uodbc_stats.h
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
link path=usr/lib/$(MACH64)/libesoobS.so target=libesoobS.so.1.0.0
link path=usr/lib/$(MACH64)/libesoobS.so.1 target=libesoobS.so.1.0.0
file path=usr/lib/$(MACH64)/libesoobS.so.1.0.0
@@ -72,21 +63,24 @@
link path=usr/lib/$(MACH64)/libnn.so target=libnn.so.1.0.0
link path=usr/lib/$(MACH64)/libnn.so.1 target=libnn.so.1.0.0
file path=usr/lib/$(MACH64)/libnn.so.1.0.0
-link path=usr/lib/$(MACH64)/libodbc.so target=libodbc.so.1.0.0
-link path=usr/lib/$(MACH64)/libodbc.so.1 target=libodbc.so.1.0.0
-file path=usr/lib/$(MACH64)/libodbc.so.1.0.0
-link path=usr/lib/$(MACH64)/libodbccr.so target=libodbccr.so.1.0.0
-link path=usr/lib/$(MACH64)/libodbccr.so.1 target=libodbccr.so.1.0.0
-file path=usr/lib/$(MACH64)/libodbccr.so.1.0.0
+link path=usr/lib/$(MACH64)/libodbc.so target=libodbc.so.2.0.0
+link path=usr/lib/$(MACH64)/libodbc.so.1 target=libodbc.so.2.0.0
+link path=usr/lib/$(MACH64)/libodbc.so.2 target=libodbc.so.2.0.0
+file path=usr/lib/$(MACH64)/libodbc.so.2.0.0
+link path=usr/lib/$(MACH64)/libodbccr.so target=libodbccr.so.2.0.0
+link path=usr/lib/$(MACH64)/libodbccr.so.1 target=libodbccr.so.2.0.0
+link path=usr/lib/$(MACH64)/libodbccr.so.2 target=libodbccr.so.2.0.0
+file path=usr/lib/$(MACH64)/libodbccr.so.2.0.0
link path=usr/lib/$(MACH64)/libodbcdrvcfg1S.so target=libodbcdrvcfg1S.so.1.0.0
link path=usr/lib/$(MACH64)/libodbcdrvcfg1S.so.1 target=libodbcdrvcfg1S.so.1.0.0
file path=usr/lib/$(MACH64)/libodbcdrvcfg1S.so.1.0.0
link path=usr/lib/$(MACH64)/libodbcdrvcfg2S.so target=libodbcdrvcfg2S.so.1.0.0
link path=usr/lib/$(MACH64)/libodbcdrvcfg2S.so.1 target=libodbcdrvcfg2S.so.1.0.0
file path=usr/lib/$(MACH64)/libodbcdrvcfg2S.so.1.0.0
-link path=usr/lib/$(MACH64)/libodbcinst.so target=libodbcinst.so.1.0.0
-link path=usr/lib/$(MACH64)/libodbcinst.so.1 target=libodbcinst.so.1.0.0
-file path=usr/lib/$(MACH64)/libodbcinst.so.1.0.0
+link path=usr/lib/$(MACH64)/libodbcinst.so target=libodbcinst.so.2.0.0
+link path=usr/lib/$(MACH64)/libodbcinst.so.1 target=libodbcinst.so.2.0.0
+link path=usr/lib/$(MACH64)/libodbcinst.so.2 target=libodbcinst.so.2.0.0
+file path=usr/lib/$(MACH64)/libodbcinst.so.2.0.0
link path=usr/lib/$(MACH64)/libodbcminiS.so target=libodbcminiS.so.1.0.0
link path=usr/lib/$(MACH64)/libodbcminiS.so.1 target=libodbcminiS.so.1.0.0
file path=usr/lib/$(MACH64)/libodbcminiS.so.1.0.0
@@ -120,7 +114,6 @@
link path=usr/lib/$(MACH64)/libtemplate.so target=libtemplate.so.1.0.0
link path=usr/lib/$(MACH64)/libtemplate.so.1 target=libtemplate.so.1.0.0
file path=usr/lib/$(MACH64)/libtemplate.so.1.0.0
-dir path=usr/lib/$(MACH64)/pkgconfig
file path=usr/lib/$(MACH64)/pkgconfig/unixODBC.pc
link path=usr/lib/libesoobS.so target=libesoobS.so.1.0.0
#
@@ -132,21 +125,24 @@
link path=usr/lib/libnn.so target=libnn.so.1.0.0
link path=usr/lib/libnn.so.1 target=libnn.so.1.0.0
file path=usr/lib/libnn.so.1.0.0
-link path=usr/lib/libodbc.so target=libodbc.so.1.0.0
-link path=usr/lib/libodbc.so.1 target=libodbc.so.1.0.0
-file path=usr/lib/libodbc.so.1.0.0
-link path=usr/lib/libodbccr.so target=libodbccr.so.1.0.0
-link path=usr/lib/libodbccr.so.1 target=libodbccr.so.1.0.0
-file path=usr/lib/libodbccr.so.1.0.0
+link path=usr/lib/libodbc.so target=libodbc.so.2.0.0
+link path=usr/lib/libodbc.so.1 target=libodbc.so.2.0.0
+link path=usr/lib/libodbc.so.2 target=libodbc.so.2.0.0
+file path=usr/lib/libodbc.so.2.0.0
+link path=usr/lib/libodbccr.so target=libodbccr.so.2.0.0
+link path=usr/lib/libodbccr.so.1 target=libodbccr.so.2.0.0
+link path=usr/lib/libodbccr.so.2 target=libodbccr.so.2.0.0
+file path=usr/lib/libodbccr.so.2.0.0
link path=usr/lib/libodbcdrvcfg1S.so target=libodbcdrvcfg1S.so.1.0.0
link path=usr/lib/libodbcdrvcfg1S.so.1 target=libodbcdrvcfg1S.so.1.0.0
file path=usr/lib/libodbcdrvcfg1S.so.1.0.0
link path=usr/lib/libodbcdrvcfg2S.so target=libodbcdrvcfg2S.so.1.0.0
link path=usr/lib/libodbcdrvcfg2S.so.1 target=libodbcdrvcfg2S.so.1.0.0
file path=usr/lib/libodbcdrvcfg2S.so.1.0.0
-link path=usr/lib/libodbcinst.so target=libodbcinst.so.1.0.0
-link path=usr/lib/libodbcinst.so.1 target=libodbcinst.so.1.0.0
-file path=usr/lib/libodbcinst.so.1.0.0
+link path=usr/lib/libodbcinst.so target=libodbcinst.so.2.0.0
+link path=usr/lib/libodbcinst.so.1 target=libodbcinst.so.2.0.0
+link path=usr/lib/libodbcinst.so.2 target=libodbcinst.so.2.0.0
+file path=usr/lib/libodbcinst.so.2.0.0
link path=usr/lib/libodbcminiS.so target=libodbcminiS.so.1.0.0
link path=usr/lib/libodbcminiS.so.1 target=libodbcminiS.so.1.0.0
file path=usr/lib/libodbcminiS.so.1.0.0
@@ -180,7 +176,6 @@
link path=usr/lib/libtemplate.so target=libtemplate.so.1.0.0
link path=usr/lib/libtemplate.so.1 target=libtemplate.so.1.0.0
file path=usr/lib/libtemplate.so.1.0.0
-dir path=usr/lib/pkgconfig
file path=usr/lib/pkgconfig/unixODBC.pc
#
license unixodbc.license license="LGPLv2.1, GPLv2"