diff options
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch | 33 | ||||
| -rw-r--r-- | meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb (renamed from meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb) | 8 |
2 files changed, 2 insertions, 39 deletions
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 @@ | |||
| 1 | From 5d335b5ddd052f047759cae0e9b94ec49f9f3884 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
| 3 | Date: Mon, 20 Mar 2023 02:03:04 +0000 | ||
| 4 | Subject: [PATCH] pgpool2: Fix unknown type name 'fd_set' error with musl. | ||
| 5 | |||
| 6 | | read.c: In function 'read_until_ready_for_query': | ||
| 7 | | read.c:53:24: error: storage size of 'timeoutval' isn't known | ||
| 8 | | 53 | struct timeval timeoutval; | ||
| 9 | | | ^~~~~~~~~~ | ||
| 10 | | read.c:54:9: error: unknown type name 'fd_set' | ||
| 11 | | 54 | fd_set readmask; | ||
| 12 | | | ^~~~~~ | ||
| 13 | |||
| 14 | Upstream-Status: Inappropriate [embedded specific] | ||
| 15 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
| 16 | --- | ||
| 17 | src/tools/pgproto/read.c | 1 + | ||
| 18 | 1 file changed, 1 insertion(+) | ||
| 19 | |||
| 20 | diff --git a/src/tools/pgproto/read.c b/src/tools/pgproto/read.c | ||
| 21 | index c7fb548..4efe641 100644 | ||
| 22 | --- a/src/tools/pgproto/read.c | ||
| 23 | +++ b/src/tools/pgproto/read.c | ||
| 24 | @@ -19,6 +19,7 @@ | ||
| 25 | #include "../../include/config.h" | ||
| 26 | #include "pgproto/pgproto.h" | ||
| 27 | #include <unistd.h> | ||
| 28 | +#include <sys/select.h> | ||
| 29 | #include <stdlib.h> | ||
| 30 | #include <stdio.h> | ||
| 31 | #include <string.h> | ||
| 32 | -- | ||
| 33 | 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 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 @@ | |||
| 1 | SUMMARY = "a language independent connection pool server for PostgreSQL." | 1 | SUMMARY = "A language independent connection pool server for PostgreSQL." |
| 2 | 2 | ||
| 3 | DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ | 3 | DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ |
| 4 | servers and a PostgreSQL database client. It is distributed \ | 4 | servers and a PostgreSQL database client. It is distributed \ |
| @@ -12,11 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" | |||
| 12 | 12 | ||
| 13 | SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ | 13 | SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ |
| 14 | file://0001-Fix-build-error-when-build-this-file.patch \ | 14 | file://0001-Fix-build-error-when-build-this-file.patch \ |
| 15 | file://0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch \ | ||
| 16 | file://pgpool.sysconfig \ | 15 | file://pgpool.sysconfig \ |
| 17 | file://pgpool.service \ | 16 | file://pgpool.service \ |
| 18 | " | 17 | " |
| 19 | SRC_URI[sha256sum] = "4b379bbba8e178128a1cee4a5bd1ae116dedb3da6121b728c18f0f54c881f328" | 18 | SRC_URI[sha256sum] = "8e14b0558a15dae8767c8e1acee3f2f6c7c08ebfffda66a359367eaaa56c3936" |
| 20 | 19 | ||
| 21 | S = "${WORKDIR}/pgpool-II-${PV}" | 20 | S = "${WORKDIR}/pgpool-II-${PV}" |
| 22 | 21 | ||
| @@ -34,9 +33,6 @@ PACKAGECONFIG[postgresql] = "--with-pgsql-includedir=${STAGING_INCDIR}/postgresq | |||
| 34 | EXTRA_OECONF += "--disable-static \ | 33 | EXTRA_OECONF += "--disable-static \ |
| 35 | --disable-rpath \ | 34 | --disable-rpath \ |
| 36 | " | 35 | " |
| 37 | |||
| 38 | CFLAGS:append = " -fcommon " | ||
| 39 | |||
| 40 | FILES:${PN} += "${datadir}/pgpool-II/ " | 36 | FILES:${PN} += "${datadir}/pgpool-II/ " |
| 41 | 37 | ||
| 42 | do_configure:append() { | 38 | do_configure:append() { |
