Skip to content

Commit e42d1e7

Browse files
committed
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 <[email protected]>
1 parent ffa6aff commit e42d1e7

File tree

3 files changed

+15
-24
lines changed

3 files changed

+15
-24
lines changed

meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ extending the existing aarch64 macro works.
99
src/include/storage/s_lock.h | 5 +++--
1010
1 file changed, 3 insertions(+), 2 deletions(-)
1111

12-
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
13-
index 3fe29ce..7cd578f 100644
14-
--- a/src/include/storage/s_lock.h
15-
+++ b/src/include/storage/s_lock.h
12+
Index: postgresql-12.16/src/include/storage/s_lock.h
13+
===================================================================
14+
--- postgresql-12.16.orig/src/include/storage/s_lock.h
15+
+++ postgresql-12.16/src/include/storage/s_lock.h
1616
@@ -317,11 +317,12 @@ tas(volatile slock_t *lock)
1717

1818
/*
@@ -35,7 +35,4 @@ index 3fe29ce..7cd578f 100644
3535
+#endif /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */
3636

3737

38-
/*
39-
--
40-
2.9.3
41-
38+
/* S/390 and S/390x Linux (32- and 64-bit zSeries) */

meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ Signed-off-by: Hongxu Jia <[email protected]>
1919
src/common/Makefile | 4 ----
2020
1 file changed, 4 deletions(-)
2121

22-
diff --git a/src/common/Makefile b/src/common/Makefile
23-
index 1fc2c66..5e6c457 100644
24-
--- a/src/common/Makefile
25-
+++ b/src/common/Makefile
26-
@@ -27,10 +27,6 @@ include $(top_builddir)/src/Makefile.global
22+
Index: postgresql-12.16/src/common/Makefile
23+
===================================================================
24+
--- postgresql-12.16.orig/src/common/Makefile
25+
+++ postgresql-12.16/src/common/Makefile
26+
@@ -31,10 +31,6 @@ include $(top_builddir)/src/Makefile.glo
2727
# don't include subdirectory-path-dependent -I and -L switches
2828
STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
2929
STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
@@ -34,6 +34,3 @@ index 1fc2c66..5e6c457 100644
3434
override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
3535
override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
3636
override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
37-
--
38-
2.7.4
39-

meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ Signed-off-by: Changqing Li <[email protected]>
1919
configure.in | 2 +-
2020
1 file changed, 1 insertion(+), 1 deletion(-)
2121

22-
diff --git a/configure.in b/configure.in
23-
index b98b9bb..8584677 100644
24-
--- a/configure.in
25-
+++ b/configure.in
26-
@@ -2211,7 +2211,7 @@ Use --without-tcl to disable building PL/Tcl.])
22+
Index: postgresql-12.16/configure.in
23+
===================================================================
24+
--- postgresql-12.16.orig/configure.in
25+
+++ postgresql-12.16/configure.in
26+
@@ -2357,7 +2357,7 @@ Use --without-tcl to disable building PL
2727
fi
2828

2929
# check for <perl.h>
@@ -32,6 +32,3 @@ index b98b9bb..8584677 100644
3232
ac_save_CPPFLAGS=$CPPFLAGS
3333
CPPFLAGS="$CPPFLAGS $perl_includespec"
3434
AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
35-
--
36-
2.7.4
37-

0 commit comments

Comments
 (0)