Received: by mail.netbsd.org (Postfix, from userid 605) id 525DF84E63; Sun, 26 Jan 2020 19:04:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D0C0484E62 for ; Sun, 26 Jan 2020 19:04:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 0mO-twAHzFAP for ; Sun, 26 Jan 2020 19:04:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 54F6C84CCD for ; Sun, 26 Jan 2020 19:04:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4DDA4FBF4; Sun, 26 Jan 2020 19:04:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1580065483294310" MIME-Version: 1.0 Date: Sun, 26 Jan 2020 19:04:43 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/lang/quickjs To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20200126190443.4DDA4FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1580065483294310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Sun Jan 26 19:04:43 UTC 2020 Modified Files: pkgsrc/lang/quickjs: Makefile PLIST Added Files: pkgsrc/lang/quickjs/files: netbsd-has-atomic64.c Log Message: Use a pkgsrc-compatible version number. Bignum is conditional on 64-bit atomics; mimic that in Makefile and conditionalize in PLIST. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/quickjs/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/quickjs/PLIST cvs rdiff -u -r0 -r1.1 pkgsrc/lang/quickjs/files/netbsd-has-atomic64.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1580065483294310 Content-Disposition: inline Content-Length: 1960 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/quickjs/Makefile diff -u pkgsrc/lang/quickjs/Makefile:1.2 pkgsrc/lang/quickjs/Makefile:1.3 --- pkgsrc/lang/quickjs/Makefile:1.2 Sun Jan 26 18:37:49 2020 +++ pkgsrc/lang/quickjs/Makefile Sun Jan 26 19:04:43 2020 @@ -1,6 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2020/01/26 18:37:49 he Exp $ +# $NetBSD: Makefile,v 1.3 2020/01/26 19:04:43 he Exp $ -DISTNAME= quickjs-2020-01-19 +NAME= quickjs +DATE= 2020-01-19 +VERSION= ${DATE:S/-//g} +DISTNAME= ${NAME}-${DATE} +PKGNAME= ${NAME}-${VERSION} CATEGORIES= lang MASTER_SITES= https://bellard.org/quickjs/ EXTRACT_SUFX= .tar.xz @@ -14,4 +18,16 @@ USE_TOOLS+= gmake MAKE_FLAGS= prefix=${PREFIX} TEST_TARGET= test +.include "../../mk/bsd.prefs.mk" + +PLIST_VARS+= bignum +.if ${OPSYS} == "NetBSD" +HAS_ATOMIC_64!= ${CC} -E files/netbsd-has-atomic64.c | tail -1 +.if (${HAS_ATOMIC_64} == "YES") +PLIST.bignum = yes +.endif +.else # Not NetBSD +PLIST.bignum = yes +.endif + .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/quickjs/PLIST diff -u pkgsrc/lang/quickjs/PLIST:1.1 pkgsrc/lang/quickjs/PLIST:1.2 --- pkgsrc/lang/quickjs/PLIST:1.1 Thu Nov 14 21:20:04 2019 +++ pkgsrc/lang/quickjs/PLIST Sun Jan 26 19:04:43 2020 @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2019/11/14 21:20:04 rillig Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/01/26 19:04:43 he Exp $ bin/qjs -bin/qjsbn -bin/qjsbnc +${PLIST.bignum}bin/qjsbn +${PLIST.bignum}bin/qjsbnc bin/qjsc bin/qjscalc include/quickjs/quickjs-libc.h include/quickjs/quickjs.h lib/quickjs/libquickjs.a -lib/quickjs/libquickjs.bn.a +${PLIST.bignum}lib/quickjs/libquickjs.bn.a Added files: Index: pkgsrc/lang/quickjs/files/netbsd-has-atomic64.c diff -u /dev/null pkgsrc/lang/quickjs/files/netbsd-has-atomic64.c:1.1 --- /dev/null Sun Jan 26 19:04:43 2020 +++ pkgsrc/lang/quickjs/files/netbsd-has-atomic64.c Sun Jan 26 19:04:43 2020 @@ -0,0 +1,6 @@ +#include +#ifdef __HAVE_ATOMIC64_OPS +YES +#else +NO +#endif --_----------=_1580065483294310--