On Tue, Sep 06, 2016 at 11:43:41AM +0200, Giovanni Bechis wrote: > > Il giorno Martedi, 6 Settembre, 2016 04:19 CEST, Ian McWilliam > <i.mcwill...@westernsydney.edu.au> ha scritto: > > > The latest update to MariaDB in OpenBSD_6_0 stable tree fails to build. > > > > Need to remove one patch file. > > > yes, please unbreak. > ok giovanni@ > Cheers > Giovanni > committed, thanks Giovanni
> > > ===> Extracting for mariadb-10.0.27 > > ===> Patching for mariadb-10.0.27 > > Ignoring previously applied (or reversed) patch. > > 1 out of 1 hunks ignored--saving rejects to > > storage/innobase/include/os0sync.h.rej > > ***> patch-storage_innobase_include_os0sync_h did not apply cleanly > > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2596 > > '/usr/ports/pobj/mariadb-10.0.27/.patch_done': @if cd > > /usr/ports/databases/m...) > > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1891 > > '/usr/packages/amd64/all/mariadb-client-10.0.27v1.tgz') > > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2416 > > '_internal-package') > > *** Error 1 in /usr/ports/databases/mariadb > > (/usr/ports/infrastructure/mk/bsd.port.mk:2396 'package') > > > > > > Ian McWilliam > > > > Index: patches/patch-storage_innobase_include_os0sync_h > > =================================================================== > > RCS file: patches/patch-storage_innobase_include_os0sync_h > > diff -N patches/patch-storage_innobase_include_os0sync_h > > --- patches/patch-storage_innobase_include_os0sync_h 4 May 2016 07:37:22 > > -0000 1.4 > > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > > @@ -1,17 +0,0 @@ > > -$OpenBSD: patch-storage_innobase_include_os0sync_h,v 1.4 2016/05/04 > > 07:37:22 sthen Exp $ > > - > > -InnoDB attempted to verify if __sync_lock_test_and_set() is available by > > -checking IB_STRONG_MEMORY_MODEL. This macro has nothing to do with > > availability > > -of __sync_lock_test_and_set(), the right one is HAVE_ATOMIC_BUILTINS. > > - > > ---- storage/innobase/include/os0sync.h.orig Mon May 2 06:19:43 2016 > > -+++ storage/innobase/include/os0sync.h Mon May 2 06:20:19 2016 > > -@@ -466,7 +466,7 @@ amount to decrement. */ > > - # define os_atomic_decrement_uint64(ptr, amount) \ > > - os_atomic_decrement(ptr, amount) > > - > > --# if defined(IB_STRONG_MEMORY_MODEL) > > -+# if defined(HAVE_ATOMIC_BUILTINS) > > - > > - /** Do an atomic test and set. > > - @param[in,out] ptr Memory location to set to non-zero > > > > > >
