unixodbc: Upgrade to 2.3.12
PATCH 1/4 unixodbc: Upgrade to 2.3.12
Brings
Fix iconv handle leak with pooling
Add windows encoding patch
Avoid failed build if clock_gettime() is not available
Allow passing in a entire connection string into iusql
Allow isql to handle SQL_SUCCESS_WITH_INFO from SQLPrepare
Add extra logging for ODBCINST connect settings
Allow allocated copy (instead of fixed length) for the connection string with pooling to allow any length Export __clear_ini_cache() from odbcinst to allow explicitly clearing the ini cache
Fix seg fault when used with SQLAPI
Add --enable-utf8ini flag to add utf8 to WCHAR conversions in SQLGetPrivateProfileStringW Allow longer error messages via GetDiag functions
Add --enable-singleenv to enable single shared env handle when using pooling
---
.../unixodbc/{unixodbc_2.3.11.bb => unixodbc_2.3.12.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/unixodbc/{unixodbc_2.3.11.bb => unixodbc_2.3.12.bb} (89%)meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb renamed from meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb +2 -2
@@ -12,7 +12,7 @@ SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ " -SRC_URI[sha256sum] = "d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c" +SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -44,5 +44,5 @@ do_install:prepend() { } do_install:append() { - oe_multilib_header unixodbc.h unixODBC/config.h unixODBC/unixodbc_conf.h + oe_multilib_header unixodbc.h unixODBC/unixodbc_conf.h }
Signature · 1 line
2.44.0
PATCH 2/4 pv: Fix ptest failures
--- meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 2 +- meta-oe/recipes-support/pv/pv_1.6.20.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/conf/include/ptest-packagelists-meta-oe.inc +1 -1
@@ -35,6 +35,7 @@ PTESTS_FAST_META_OE = "\ onig \ oprofile \ protobuf \ + pv \ sdbus-c++ \ uthash \ xmlsec1 \
@@ -68,5 +69,4 @@ PTESTS_PROBLEMS_META_OE ="\ libteam \ ostree \ psqlodbc \ - pv \ "
meta-oe/recipes-support/pv/pv_1.6.20.bb +1 -1
@@ -18,7 +18,7 @@ inherit autotools ptest LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" export LDEMULATION -RDEPENDS:${PN}-ptest = "coreutils" +RDEPENDS:${PN}-ptest += "coreutils ${PN}" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests
Signature · 1 line
2.44.0
PATCH 3/4 unixodbc: Enable UTF8 init
In reply to Khem Raj--- meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +1 -1
@@ -21,7 +21,7 @@ inherit autotools-brokensep multilib_header qemu S = "${WORKDIR}/unixODBC-${PV}" EXTRA_OEMAKE += "LIBS=-lltdl" - +EXTRA_OECONF += "--enable-utf8ini" DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}"
Signature · 1 line
2.44.0
PATCH 4/4 psqlodbc: Fix ptests
In reply to Khem RajThere are two still left
Failed ptests:
{'psqlodbc': ['30_-_lfconversion', '43_-_result-conversions']}
These need using unicode postgresql driver perhaps
--- .../psqlodbc-fix-for-ptest-support.patch | 19 +++++++++++-------- .../psqlodbc/psqlodbc_16.00.0000.bb | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-)
meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch +11 -8
@@ -19,8 +19,6 @@ Signed-off-by: Jackie Huang <[email protected]> test/runsuite.c | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) -diff --git a/test/Makefile.in b/test/Makefile.in -index 3f9a9af..09406ae 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -19,7 +19,7 @@ CPPFLAGS = @CPPFLAGS@ -I.. # config.h
@@ -32,8 +30,6 @@ index 3f9a9af..09406ae 100644 all: $(TESTBINS) runsuite reset-db -diff --git a/test/odbcini-gen.sh b/test/odbcini-gen.sh -index 2eaba35..6555cdb 100755 --- a/test/odbcini-gen.sh +++ b/test/odbcini-gen.sh @@ -6,7 +6,7 @@
@@ -45,6 +41,15 @@ index 2eaba35..6555cdb 100755 driver=${drvr}.so if test ! -e $driver ; then driver=${drvr}.dll +@@ -16,7 +16,7 @@ if test ! -e $driver ; then + fi + fi + +-drvra=../.libs/psqlodbca ++drvra=@LIBDIR@/psqlodbca + drivera=${drvra}.so + if test ! -e $drivera ; then + drivera=${drvra}.dll @@ -52,10 +52,10 @@ Driver = PostgreSQL Unicode Trace = No TraceFile =
@@ -59,8 +64,6 @@ index 2eaba35..6555cdb 100755 ReadOnly = No RowVersioning = No ShowSystemTables = No -diff --git a/test/runsuite.c b/test/runsuite.c -index 3be5732..cd842dc 100644 --- a/test/runsuite.c +++ b/test/runsuite.c @@ -55,7 +55,7 @@ bailout(const char *fmt, ...)
@@ -72,7 +75,7 @@ index 3be5732..cd842dc 100644 { const char *basename; #ifdef WIN32 -@@ -69,7 +69,7 @@ parse_argument(const char *in, char *testname, char *binname) +@@ -69,7 +69,7 @@ parse_argument(const char *in, char *tes if (strchr(in, DIR_SEP) == NULL) { strcpy(testname, in);
@@ -90,7 +93,7 @@ index 3be5732..cd842dc 100644 if (runtest(binname, testname, i, inputdir) != 0) failures++; } -@@ -161,29 +161,29 @@ runtest(const char *binname, const char *testname, int testno, const char *input +@@ -161,29 +161,29 @@ runtest(const char *binname, const char #ifndef WIN32 snprintf(cmdline, sizeof(cmdline), "ODBCSYSINI=. ODBCINSTINI=./odbcinst.ini ODBCINI=./odbc.ini "
meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb +2 -2
@@ -58,5 +58,5 @@ do_install_ptest() { FILES:${PN} += "${libdir}" # The tests need a local PostgreSQL server running -RDEPENDS:${PN}-ptest = "postgresql" - +RDEPENDS:${PN}-ptest += "psqlodbc postgresql diffutils" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils locale-base-en-us glibc-gconv glibc-charmaps"
Signature · 1 line
2.44.0