On Mon, 13 Nov 2017 12:13:03 -0500, Daniel Jakots <danj+o...@chown.me>
wrote:
> On Mon, 13 Nov 2017 17:36:11 +0100, Pierre-Emmanuel André
> <p...@raveland.org> wrote:
>
> > Please note that this diff is valid for OpenBSD 6.2 too.
> > No objections for the commit to -stable ?
>
> ok danj@
>
Well actually, can you commit the patch attached as well, so the port's
patches apply cleanly. Merci pea ;)
Index: patches/patch-src_backend_storage_lmgr_s_lock_c
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_backend_storage_lmgr_s_lock_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_backend_storage_lmgr_s_lock_c
--- patches/patch-src_backend_storage_lmgr_s_lock_c 8 Jan 2015 15:01:11 -0000 1.2
+++ patches/patch-src_backend_storage_lmgr_s_lock_c 13 Nov 2017 17:14:15 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_backend_storage_lmgr_s_lock_c,v 1.2 2015/01/08 15:01:11 pea Exp $
---- src/backend/storage/lmgr/s_lock.c.orig Sun May 11 14:16:48 2014
-+++ src/backend/storage/lmgr/s_lock.c Thu May 15 21:52:50 2014
-@@ -219,7 +219,7 @@ static void
+Index: src/backend/storage/lmgr/s_lock.c
+--- src/backend/storage/lmgr/s_lock.c.orig
++++ src/backend/storage/lmgr/s_lock.c
+@@ -251,7 +251,7 @@ static void
tas_dummy()
{
__asm__ __volatile__(
Index: patches/patch-src_bin_scripts_vacuumdb_c
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_bin_scripts_vacuumdb_c
--- patches/patch-src_bin_scripts_vacuumdb_c 10 Sep 2016 13:03:41 -0000 1.1
+++ patches/patch-src_bin_scripts_vacuumdb_c 13 Nov 2017 17:14:15 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_bin_scripts_vacuumdb_c,v 1.1 2016/09/10 13:03:41 ajacoutot Exp $
---- src/bin/scripts/vacuumdb.c.orig Sat Sep 10 10:37:08 2016
-+++ src/bin/scripts/vacuumdb.c Sat Sep 10 10:38:12 2016
+Index: src/bin/scripts/vacuumdb.c
+--- src/bin/scripts/vacuumdb.c.orig
++++ src/bin/scripts/vacuumdb.c
@@ -10,6 +10,8 @@
*-------------------------------------------------------------------------
*/
@@ -9,4 +10,4 @@ $OpenBSD: patch-src_bin_scripts_vacuumdb
+
#include "postgres_fe.h"
- #include "common.h"
+ #ifdef HAVE_SYS_SELECT_H
Index: patches/patch-src_include_storage_s_lock_h
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_include_storage_s_lock_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_include_storage_s_lock_h
--- patches/patch-src_include_storage_s_lock_h 13 Feb 2016 21:54:28 -0000 1.3
+++ patches/patch-src_include_storage_s_lock_h 13 Nov 2017 17:14:15 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-src_include_storage_s_lock_h,v 1.3 2016/02/13 21:54:28 sthen Exp $
---- src/include/storage/s_lock.h.orig Mon Feb 8 21:15:19 2016
-+++ src/include/storage/s_lock.h Fri Feb 12 17:18:09 2016
-@@ -749,6 +749,29 @@ typedef unsigned char slock_t;
+Index: src/include/storage/s_lock.h
+--- src/include/storage/s_lock.h.orig
++++ src/include/storage/s_lock.h
+@@ -693,6 +693,29 @@ typedef unsigned char slock_t;
+ do { __asm__ __volatile__("" : : : "memory"); *(lock) = 0; } while (0)
#endif
-
+#if defined(__m88k__) /* Motorola 88k */
+#define HAS_TEST_AND_SET
