Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 8E1B27A27F for ; Sun, 2 Oct 2016 22:53:25 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 09B8585E93; Sun, 2 Oct 2016 22:53:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8D05885E80 for ; Sun, 2 Oct 2016 22:53:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id zh4Nr_gQQX77 for ; Sun, 2 Oct 2016 22:53:24 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 242AF85E27 for ; Sun, 2 Oct 2016 22:53:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1AC98FBD2; Sun, 2 Oct 2016 22:53:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147544880421200" MIME-Version: 1.0 Date: Sun, 2 Oct 2016 22:53:24 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/devel/nss To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20161002225324.1AC98FBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_147544880421200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sun Oct 2 22:53:24 UTC 2016 Modified Files: pkgsrc/devel/nss: Makefile Log Message: nss: replace USE_NSS_64 with _LP64 builtin. fixes build for 32bit when passing USE_64 (which is questionable)... in pkgsrc we declare all mips64* platforms as 64bit, and use USE_64. However, netbsd/mips64 is using a 32bit ABI, so it is akin to passing USE_64=1 for 32bit. perhaps not declaring it a 64bit platform is correct, but this package is one of the only few using this logic, and it's unfeasible to have correct logic for 32bit/64bit. this package has considerably more logic for USE_64 than for USE_NSS_64, so to avoid inadvertent damage to other platforms, retain the USE_64=1 logic. feel free to object to this option in the discussion on tech-pkg. To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 pkgsrc/devel/nss/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_147544880421200 Content-Disposition: inline Content-Length: 916 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/nss/Makefile diff -u pkgsrc/devel/nss/Makefile:1.118 pkgsrc/devel/nss/Makefile:1.119 --- pkgsrc/devel/nss/Makefile:1.118 Fri Sep 30 11:59:12 2016 +++ pkgsrc/devel/nss/Makefile Sun Oct 2 22:53:23 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.118 2016/09/30 11:59:12 ryoon Exp $ +# $NetBSD: Makefile,v 1.119 2016/10/02 22:53:23 maya Exp $ DISTNAME= nss-${NSS_RELEASE:S/.0$//} NSS_RELEASE= 3.27.0 @@ -53,6 +53,14 @@ PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} MAKE_ENV+= NS_USE_GCC=YES .endif +SUBST_CLASSES+= 64bit +SUBST_STAGE.64bit= post-patch +SUBST_FILES.64bit= nss/lib/freebl/* +SUBST_SED.64bit= -e 's,NSS_USE_64,_LP64,g' +SUBST_MESSAGE.conf= Use a generic 64bit check + +# Just to be safe, do this as well as the _LP64 replacement +# NSS has a lot more logic for USE_64 .for platform in ${LP64PLATFORMS} . if ${MACHINE_PLATFORM:M${platform}} MAKE_ENV+= USE_64=1 --_----------=_147544880421200--