3 files changed, 28 insertions, 1 deletions

diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
new file mode 100644
index 0000000000..89a509087f
--- /dev/null
+++ b/meta-oe/recipes-dbs/postgresql/files/0001-tcl.m4-Recognize-tclsh9.patch
@@ -0,0 +1,26 @@
+From f0d8240dbf594e6dfab31fd7d70ce340ac365a65 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 3 Nov 2024 15:50:50 -0800
+Subject: [PATCH] tcl.m4: Recognize tclsh9
+
+Add missing support to recognize tclsh9 as supported
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ config/tcl.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/tcl.m4 b/config/tcl.m4
+index 9de31a5..568fd45 100644
+--- a/config/tcl.m4
++++ b/config/tcl.m4
+@@ -4,7 +4,7 @@
+ 
+ 
+ AC_DEFUN([PGAC_PATH_TCLSH],
+-[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
++[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh9.0 tclsh90 tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
+ AC_ARG_VAR(TCLSH, [Tcl interpreter program (tclsh)])dnl
+ if test x"$TCLSH" = x""; then
+   AC_MSG_ERROR([Tcl shell not found])
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index fb3bca2724..ec5daeaa66 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql.inc
+++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc
@@ -39,7 +39,7 @@ export LDFLAGS_EX_BE = "-Wl,--export-dynamic"
 
 inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext perl-version multilib_header
 
-CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6"
+CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}"
 
 SYSTEMD_SERVICE:${PN} = "postgresql.service"
 SYSTEMD_AUTO_ENABLE:${PN} = "disable"
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb b/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb
index 1a47369e4d..7135263dac 100644
--- a/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb
+++ b/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb
@@ -9,6 +9,7 @@ SRC_URI += "\
    file://0003-configure.ac-bypass-autoconf-2.69-version-check.patch \
    file://0004-config_info.c-not-expose-build-info.patch \
    file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \
+   file://0001-tcl.m4-Recognize-tclsh9.patch \
 "
 
 SRC_URI[sha256sum] = "971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f"