diff options
author | Armin Kuster <akuster808@gmail.com> | 2023-09-09 16:01:29 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-09-09 12:52:03 -0400 |
commit | e42d1e758f9f08b98c0e8c6f0532316951bb276f (patch) | |
tree | 09b30a5b672921a0717abdd491b533895f4a9f06 | |
parent | ffa6aff5da51313b2b5333ecbcd78d7e9c23a61b (diff) | |
download | meta-openembedded-e42d1e758f9f08b98c0e8c6f0532316951bb276f.tar.gz |
postgresql: refresh patches
fixes:
WARNING: postgresql-12.16-r0 do_patch: Fuzz detected:
Applying patch 0001-Add-support-for-RISC-V.patch
patching file src/include/storage/s_lock.h
Hunk #2 succeeded at 339 with fuzz 1.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
3 files changed, 15 insertions, 24 deletions
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch index a1f5b2a7b4..e5fb85170b 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch | |||
@@ -9,10 +9,10 @@ extending the existing aarch64 macro works. | |||
9 | src/include/storage/s_lock.h | 5 +++-- | 9 | src/include/storage/s_lock.h | 5 +++-- |
10 | 1 file changed, 3 insertions(+), 2 deletions(-) | 10 | 1 file changed, 3 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h | 12 | Index: postgresql-12.16/src/include/storage/s_lock.h |
13 | index 3fe29ce..7cd578f 100644 | 13 | =================================================================== |
14 | --- a/src/include/storage/s_lock.h | 14 | --- postgresql-12.16.orig/src/include/storage/s_lock.h |
15 | +++ b/src/include/storage/s_lock.h | 15 | +++ postgresql-12.16/src/include/storage/s_lock.h |
16 | @@ -317,11 +317,12 @@ tas(volatile slock_t *lock) | 16 | @@ -317,11 +317,12 @@ tas(volatile slock_t *lock) |
17 | 17 | ||
18 | /* | 18 | /* |
@@ -35,7 +35,4 @@ index 3fe29ce..7cd578f 100644 | |||
35 | +#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ | 35 | +#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */ |
36 | 36 | ||
37 | 37 | ||
38 | /* | 38 | /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ |
39 | -- | ||
40 | 2.9.3 | ||
41 | |||
diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch index 32b7f42845..70c813adf5 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch | |||
@@ -19,11 +19,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
19 | src/common/Makefile | 4 ---- | 19 | src/common/Makefile | 4 ---- |
20 | 1 file changed, 4 deletions(-) | 20 | 1 file changed, 4 deletions(-) |
21 | 21 | ||
22 | diff --git a/src/common/Makefile b/src/common/Makefile | 22 | Index: postgresql-12.16/src/common/Makefile |
23 | index 1fc2c66..5e6c457 100644 | 23 | =================================================================== |
24 | --- a/src/common/Makefile | 24 | --- postgresql-12.16.orig/src/common/Makefile |
25 | +++ b/src/common/Makefile | 25 | +++ postgresql-12.16/src/common/Makefile |
26 | @@ -27,10 +27,6 @@ include $(top_builddir)/src/Makefile.global | 26 | @@ -31,10 +31,6 @@ include $(top_builddir)/src/Makefile.glo |
27 | # don't include subdirectory-path-dependent -I and -L switches | 27 | # don't include subdirectory-path-dependent -I and -L switches |
28 | STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) | 28 | STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) |
29 | STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) | 29 | STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) |
@@ -34,6 +34,3 @@ index 1fc2c66..5e6c457 100644 | |||
34 | override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" | 34 | override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" |
35 | override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" | 35 | override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" |
36 | override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" | 36 | override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" |
37 | -- | ||
38 | 2.7.4 | ||
39 | |||
diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index 22b62d9ded..eb6226b179 100644 --- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch | |||
@@ -19,11 +19,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
19 | configure.in | 2 +- | 19 | configure.in | 2 +- |
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/configure.in b/configure.in | 22 | Index: postgresql-12.16/configure.in |
23 | index b98b9bb..8584677 100644 | 23 | =================================================================== |
24 | --- a/configure.in | 24 | --- postgresql-12.16.orig/configure.in |
25 | +++ b/configure.in | 25 | +++ postgresql-12.16/configure.in |
26 | @@ -2211,7 +2211,7 @@ Use --without-tcl to disable building PL/Tcl.]) | 26 | @@ -2357,7 +2357,7 @@ Use --without-tcl to disable building PL |
27 | fi | 27 | fi |
28 | 28 | ||
29 | # check for <perl.h> | 29 | # check for <perl.h> |
@@ -32,6 +32,3 @@ index b98b9bb..8584677 100644 | |||
32 | ac_save_CPPFLAGS=$CPPFLAGS | 32 | ac_save_CPPFLAGS=$CPPFLAGS |
33 | CPPFLAGS="$CPPFLAGS $perl_includespec" | 33 | CPPFLAGS="$CPPFLAGS $perl_includespec" |
34 | AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], | 34 | AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])], |
35 | -- | ||
36 | 2.7.4 | ||
37 | |||