Received: by mail.netbsd.org (Postfix, from userid 605) id CDB7F84DB9; Thu, 15 Dec 2022 23:01:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0707F84D60 for ; Thu, 15 Dec 2022 23:01:19 +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 0pzv0bO3Tg8b for ; Thu, 15 Dec 2022 23:01:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2AB1984CE3 for ; Thu, 15 Dec 2022 23:01:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 24131FA90; Thu, 15 Dec 2022 23:01:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16711452789990" MIME-Version: 1.0 Date: Thu, 15 Dec 2022 23:01:18 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/nspr To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20221215230118.24131FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16711452789990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Dec 15 23:01:17 UTC 2022 Modified Files: pkgsrc/devel/nspr: Makefile buildlink3.mk distinfo pkgsrc/devel/nspr/patches: patch-nspr_pr_src_pthreads_ptthread.c Log Message: nspr: properly fix nspr/pr/src/pthreads/ptthread.c; pkglint fixes To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 pkgsrc/devel/nspr/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/nspr/buildlink3.mk cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/nspr/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16711452789990 Content-Disposition: inline Content-Length: 4082 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/nspr/Makefile diff -u pkgsrc/devel/nspr/Makefile:1.121 pkgsrc/devel/nspr/Makefile:1.122 --- pkgsrc/devel/nspr/Makefile:1.121 Mon Sep 12 13:12:44 2022 +++ pkgsrc/devel/nspr/Makefile Thu Dec 15 23:01:17 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2022/09/12 13:12:44 wiz Exp $ +# $NetBSD: Makefile,v 1.122 2022/12/15 23:01:17 adam Exp $ DISTNAME= nspr-${NSPR_RELEASE:S/.0$//} NSPR_RELEASE= 4.35.0 @@ -27,11 +27,11 @@ REPLACE_PERL+= nspr/pr/src/misc/compile CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --with-pthreads -CONFIGURE_ENV+= LIBRUNPATH=${PREFIX:Q}/lib/nspr +CONFIGURE_ENV+= LIBRUNPATH=${PREFIX}/lib/nspr .include "../../mk/bsd.prefs.mk" -.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +.if ${USE_CROSS_COMPILE:U:tl} == yes MAKE_FLAGS+= HOST_CC=${NATIVE_CC:Q} MAKE_FLAGS+= HOST_CXX=${NATIVE_CXX:Q} .endif Index: pkgsrc/devel/nspr/buildlink3.mk diff -u pkgsrc/devel/nspr/buildlink3.mk:1.27 pkgsrc/devel/nspr/buildlink3.mk:1.28 --- pkgsrc/devel/nspr/buildlink3.mk:1.27 Tue Jun 28 11:31:49 2022 +++ pkgsrc/devel/nspr/buildlink3.mk Thu Dec 15 23:01:17 2022 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2022/06/28 11:31:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2022/12/15 23:01:17 adam Exp $ BUILDLINK_TREE+= nspr @@ -6,7 +6,7 @@ BUILDLINK_TREE+= nspr NSPR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.nspr+= nspr>=4.9.3.2 -BUILDLINK_ABI_DEPENDS.nspr?= nspr>=4.34nb1 +BUILDLINK_ABI_DEPENDS.nspr+= nspr>=4.34nb1 BUILDLINK_PKGSRCDIR.nspr?= ../../devel/nspr BUILDLINK_LIBDIRS.nspr+= lib/nspr Index: pkgsrc/devel/nspr/distinfo diff -u pkgsrc/devel/nspr/distinfo:1.69 pkgsrc/devel/nspr/distinfo:1.70 --- pkgsrc/devel/nspr/distinfo:1.69 Mon Sep 12 13:12:44 2022 +++ pkgsrc/devel/nspr/distinfo Thu Dec 15 23:01:17 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.69 2022/09/12 13:12:44 wiz Exp $ +$NetBSD: distinfo,v 1.70 2022/12/15 23:01:17 adam Exp $ BLAKE2s (nspr-4.35.tar.gz) = c6c0e92a5198ff08e84ff1342b0ca2106e77062ca3109704f17d7d9c34084dbe SHA512 (nspr-4.35.tar.gz) = 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f @@ -8,4 +8,4 @@ SHA1 (patch-ac) = c751b8397744c969e6141f SHA1 (patch-ba) = 35f7cc7bbe7fa0f72eb7b506094ad1812b754aa5 SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = a3aba89d02cd61f748862ebb3b76050873ccdd69 SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 77fc5653bcfaf39f55f26b301992aaeb2ff2401c -SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 187fdad28d0407c440154a614d38d860b71bfad1 +SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = af881ec2be2b6b37f435751cd1ac7ad4634e5f0f Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.2 pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.3 --- pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.2 Thu Jul 1 07:23:00 2021 +++ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c Thu Dec 15 23:01:17 2022 @@ -1,16 +1,19 @@ -$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.2 2021/07/01 07:23:00 wiz Exp $ +$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.3 2022/12/15 23:01:17 adam Exp $ pthread_t may be 64-bit, avoid casting it. https://bugzilla.mozilla.org/show_bug.cgi?id=1718835 ---- nspr/pr/src/pthreads/ptthread.c.orig 2018-01-18 12:37:14.000000000 +0000 +--- nspr/pr/src/pthreads/ptthread.c.orig 2022-09-12 11:40:15.000000000 +0000 +++ nspr/pr/src/pthreads/ptthread.c -@@ -1122,7 +1122,7 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn +@@ -1183,9 +1183,9 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn _exit(status); } -PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred) +PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred) { - return (PRUint32)thred->id; /* and I don't know what they will do with it */ +- return (PRUint32)thred->id; /* and I don't know what they will do with it */ ++ return (pthread_t)thred->id; /* and I don't know what they will do with it */ } + + /* --_----------=_16711452789990--