On Sat, Feb 19 2022, Klemens Nanni <k...@openbsd.org> wrote: > [resending to ports@] > > On Sat, Feb 19, 2022 at 02:40:24AM -0700, Kurt Mosiejczuk wrote: >> http://build-failures.rhaalovely.net/sparc64/2022-02-16/net/zabbix,sqlite3,-main.log > >> In file included from duktape.h:196, >> from duktape.c:189: >> duk_config.h:1981:2: error: #error cannot determine intptr type > > Zabbix already has defines for sparc and sparc64 but this particular > code ignored them. > > I bumped all revisions just to be sure, but there's PLIST churn anyway, > so now they're justified ;) > > Only build-tested on sparc64. > Feedback? OK? > > Index: Makefile > =================================================================== > RCS file: /home/cvs/ports/net/zabbix/Makefile,v > retrieving revision 1.180 > diff -u -p -r1.180 Makefile > --- Makefile 18 Feb 2022 06:42:35 -0000 1.180 > +++ Makefile 19 Feb 2022 20:09:14 -0000 > @@ -15,8 +15,10 @@ FULLPKGNAME-web = zabbix-web-${VERSION} > FULLPKGPATH-web = net/zabbix,-web > CATEGORIES = net > > -REVISION-main = 1 > -REVISION-server = 0 > +REVISION-main = 2 > +REVISION-server = 1 > +REVISION-proxy = 0 > +REVISION-web = 0 > > MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/} > > Index: patches/patch-src_libs_zbxembed_duk_config_h > =================================================================== > RCS file: patches/patch-src_libs_zbxembed_duk_config_h > diff -N patches/patch-src_libs_zbxembed_duk_config_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_libs_zbxembed_duk_config_h 19 Feb 2022 20:14:49 > -0000 > @@ -0,0 +1,25 @@ > +$OpenBSD$ > + > +Fix sparc and sparc64 detection for intptr type > + > +Index: src/libs/zbxembed/duk_config.h > +--- src/libs/zbxembed/duk_config.h.orig > ++++ src/libs/zbxembed/duk_config.h > +@@ -1617,7 +1617,7 @@ > + */ > + #if defined(DUK_F_X86) || defined(DUK_F_X32) || \ > + defined(DUK_F_M68K) || defined(DUK_F_PPC32) || \ > +- defined(DUK_F_BCC) || \ > ++ defined(DUK_F_BCC) || defined(DUK_F_SPARC32) || \ > + (defined(__WORDSIZE) && (__WORDSIZE == 32)) || \ > + ((defined(DUK_F_OLD_SOLARIS) || defined(DUK_F_AIX) || \ > + defined(DUK_F_HPUX)) && defined(_ILP32)) || \ > +@@ -1627,7 +1627,7 @@ > + (defined(__WORDSIZE) && (__WORDSIZE == 64)) || \ > + ((defined(DUK_F_OLD_SOLARIS) || defined(DUK_F_AIX) || \ > + defined(DUK_F_HPUX)) && defined(_LP64)) || \ > +- defined(DUK_F_ARM64) > ++ defined(DUK_F_ARM64) || defined(DUK_F_SPARC64) > + #define DUK_F_64BIT_PTRS > + #else > + /* not sure, not needed with C99 anyway */
duktape is en embeddable javascript interpreter, also available as lang/duktape. It would be good to either reuse lang/duktape instead of patching n embedded copies, or to try to keep in sync the patches between the duktape copies (lang/duktape/patches/patch-src_duk_config_h). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
