summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs/psqlodbc
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-dbs/psqlodbc')
-rw-r--r--meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch45
-rw-r--r--meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb3
2 files changed, 47 insertions, 1 deletions
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
new file mode 100644
index 0000000000..9cc5ad9b86
--- /dev/null
+++ b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch
@@ -0,0 +1,45 @@
1From 5bfa9f1cd0523a0cad70cacf5ecf8c1aeb06c4d0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Tue, 22 Apr 2025 17:47:02 +0000
4Subject: [PATCH] configure: make sure to call AC_CHECK_HEADER_STDBOOL
5
6before using ac_cv_sizeof_bool
7
8It was called after this conditional, so PG_USE_STDBOOL wasn't set
9even when it should be as shown in at the end of config.log:
10
11 ac_cv_header_stdbool_h=yes
12 ac_cv_sizeof_bool=1
13 ac_cv_type__Bool=yes
14 #define SIZEOF_BOOL 1
15 #define HAVE__BOOL 1
16 #define HAVE_STDBOOL_H 1
17
18* fixes:
19 https://github.com/postgresql-interfaces/psqlodbc/issues/110
20 https://github.com/postgresql-interfaces/psqlodbc/issues/94
21
22Upstream-Status: Submitted [https://github.com/postgresql-interfaces/psqlodbc/pull/112]
23
24Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
25---
26 configure.ac | 4 +++-
27 1 file changed, 3 insertions(+), 1 deletion(-)
28
29diff --git a/configure.ac b/configure.ac
30index f35c825..ea363ca 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -28,9 +28,11 @@ AC_CHECK_SIZEOF([bool], [],
34 #include <stdbool.h>
35 #endif])
36
37+AC_CHECK_HEADER_STDBOOL()
38+
39 dnl We use <stdbool.h> if we have it and it declares type bool as having
40 dnl size 1. Otherwise, c.h will fall back to declaring bool as unsigned char.
41-if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then
42+if test "$ac_cv_header_stdbool_h" = yes && test "$ac_cv_sizeof_bool" = 1; then
43 AC_DEFINE([PG_USE_STDBOOL], 1,
44 [Define to 1 to use <stdbool.h> to define type bool.])
45 fi
diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
index a1ef8e75e9..dfd7f6a1e6 100644
--- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
+++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
@@ -19,10 +19,11 @@ HOMEPAGE = "https://odbc.postgresql.org/"
19LICENSE = "LGPL-2.0-only" 19LICENSE = "LGPL-2.0-only"
20LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" 20LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
21 21
22SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ 22SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions.old/src/${BPN}-${PV}.tar.gz \
23 file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ 23 file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
24 file://psqlodbc-donot-use-the-hardcode-libdir.patch \ 24 file://psqlodbc-donot-use-the-hardcode-libdir.patch \
25 file://psqlodbc-fix-for-ptest-support.patch \ 25 file://psqlodbc-fix-for-ptest-support.patch \
26 file://0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch \
26 file://run-ptest \ 27 file://run-ptest \
27" 28"
28 29