From 90f237bb7eb7187fbeca357ad56e372719007b32 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Thu, 23 Oct 2025 16:43:50 +0200 Subject: [PATCH] psqlodbc: upgrade 16.00.0000 -> 17.00.0006 Drop patch that was merged into this release. Changelog: https://odbc.postgresql.org/docs/release.html Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- ...sure-to-call-AC_CHECK_HEADER_STDBOOL.patch | 45 ------------------- ...c_16.00.0000.bb => psqlodbc_17.00.0006.bb} | 4 +- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch rename meta-oe/recipes-dbs/psqlodbc/{psqlodbc_16.00.0000.bb => psqlodbc_17.00.0006.bb} (92%) diff --git a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch deleted file mode 100644 index 9cc5ad9b86..0000000000 --- a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5bfa9f1cd0523a0cad70cacf5ecf8c1aeb06c4d0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 22 Apr 2025 17:47:02 +0000 -Subject: [PATCH] configure: make sure to call AC_CHECK_HEADER_STDBOOL - -before using ac_cv_sizeof_bool - -It was called after this conditional, so PG_USE_STDBOOL wasn't set -even when it should be as shown in at the end of config.log: - - ac_cv_header_stdbool_h=yes - ac_cv_sizeof_bool=1 - ac_cv_type__Bool=yes - #define SIZEOF_BOOL 1 - #define HAVE__BOOL 1 - #define HAVE_STDBOOL_H 1 - -* fixes: - https://github.com/postgresql-interfaces/psqlodbc/issues/110 - https://github.com/postgresql-interfaces/psqlodbc/issues/94 - -Upstream-Status: Submitted [https://github.com/postgresql-interfaces/psqlodbc/pull/112] - -Signed-off-by: Martin Jansa ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f35c825..ea363ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,9 +28,11 @@ AC_CHECK_SIZEOF([bool], [], - #include - #endif]) - -+AC_CHECK_HEADER_STDBOOL() -+ - dnl We use if we have it and it declares type bool as having - dnl size 1. Otherwise, c.h will fall back to declaring bool as unsigned char. --if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then -+if test "$ac_cv_header_stdbool_h" = yes && test "$ac_cv_sizeof_bool" = 1; then - AC_DEFINE([PG_USE_STDBOOL], 1, - [Define to 1 to use to define type bool.]) - fi diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb similarity index 92% rename from meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb rename to meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb index dfd7f6a1e6..cead6789f4 100644 --- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb +++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb @@ -19,11 +19,11 @@ HOMEPAGE = "https://odbc.postgresql.org/" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" -SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions.old/src/${BPN}-${PV}.tar.gz \ +PV_WITH_USCORE = "${@d.getVar('PV').replace('.', '_')}" +SRC_URI = "git://github.com/postgresql-interfaces/psqlodbc.git;protocol=https;branch=main;tag=REL-${PV_WITH_USCORE} \ file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ file://psqlodbc-donot-use-the-hardcode-libdir.patch \ file://psqlodbc-fix-for-ptest-support.patch \ - file://0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch \ file://run-ptest \ "