diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch b/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch deleted file mode 100644 index 26f8afe4d6..0000000000 --- a/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5d335b5ddd052f047759cae0e9b94ec49f9f3884 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Mon, 20 Mar 2023 02:03:04 +0000 -Subject: [PATCH] pgpool2: Fix unknown type name 'fd_set' error with musl. - -| read.c: In function 'read_until_ready_for_query': -| read.c:53:24: error: storage size of 'timeoutval' isn't known -| 53 | struct timeval timeoutval; -| | ^~~~~~~~~~ -| read.c:54:9: error: unknown type name 'fd_set' -| 54 | fd_set readmask; -| | ^~~~~~ - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Lei Maohui ---- - src/tools/pgproto/read.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/tools/pgproto/read.c b/src/tools/pgproto/read.c -index c7fb548..4efe641 100644 ---- a/src/tools/pgproto/read.c -+++ b/src/tools/pgproto/read.c -@@ -19,6 +19,7 @@ - #include "../../include/config.h" - #include "pgproto/pgproto.h" - #include -+#include - #include - #include - #include --- -2.34.1 diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb similarity index 87% rename from meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb rename to meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb index 5e6e00caeb..b127d69625 100644 --- a/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb +++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb @@ -1,4 +1,4 @@ -SUMMARY = "a language independent connection pool server for PostgreSQL." +SUMMARY = "A language independent connection pool server for PostgreSQL." DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ servers and a PostgreSQL database client. It is distributed \ @@ -12,11 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ file://0001-Fix-build-error-when-build-this-file.patch \ - file://0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch \ file://pgpool.sysconfig \ file://pgpool.service \ " -SRC_URI[sha256sum] = "4b379bbba8e178128a1cee4a5bd1ae116dedb3da6121b728c18f0f54c881f328" +SRC_URI[sha256sum] = "8e14b0558a15dae8767c8e1acee3f2f6c7c08ebfffda66a359367eaaa56c3936" S = "${WORKDIR}/pgpool-II-${PV}" @@ -34,9 +33,6 @@ PACKAGECONFIG[postgresql] = "--with-pgsql-includedir=${STAGING_INCDIR}/postgresq EXTRA_OECONF += "--disable-static \ --disable-rpath \ " - -CFLAGS:append = " -fcommon " - FILES:${PN} += "${datadir}/pgpool-II/ " do_configure:append() {