Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E026085159 for ; Tue, 7 Nov 2023 09:36:31 +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 Mhv8em2Onl2U for ; Tue, 7 Nov 2023 09:36:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3240F84E69 for ; Tue, 7 Nov 2023 09:36:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 25E2AFA2D; Tue, 7 Nov 2023 09:36:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1699349791106130" MIME-Version: 1.0 Date: Tue, 7 Nov 2023 09:36:31 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/devel To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20231107093631.25E2AFA2D@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1699349791106130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Nov 7 09:36:31 UTC 2023 Modified Files: pkgsrc/devel/gettext: Makefile.common Removed Files: pkgsrc/devel/gettext-lib: hacks.mk Log Message: gettext: Centralize hacks for older Darwin versions so they apply to all gettext packages. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/gettext/Makefile.common cvs rdiff -u -r1.1 -r0 pkgsrc/devel/gettext-lib/hacks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1699349791106130 Content-Disposition: inline Content-Length: 1318 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gettext/Makefile.common diff -u pkgsrc/devel/gettext/Makefile.common:1.22 pkgsrc/devel/gettext/Makefile.common:1.23 --- pkgsrc/devel/gettext/Makefile.common:1.22 Wed Jun 28 21:14:10 2023 +++ pkgsrc/devel/gettext/Makefile.common Tue Nov 7 09:36:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2023/06/28 21:14:10 wiz Exp $ +# $NetBSD: Makefile.common,v 1.23 2023/11/07 09:36:30 nia Exp $ # # used by devel/gettext/Makefile # used by devel/gettext-asprintf/Makefile @@ -19,3 +19,21 @@ CONFLICTS= gettext<=0.10.35 USE_LIBTOOL= yes GNU_CONFIGURE= yes GNU_CONFIGURE_STRICT= no # several sub-configures + +# Darwin does not support RPATH. It seems to attempt to force one anyway +# with earlier versions such as 10.4, resulting in a build error. +CONFIGURE_ARGS.Darwin+= --disable-rpath + +.include "../../mk/bsd.fast.prefs.mk" + +# There is a bug in the 10.4 SDK that causes struct __darwin_ucontext +# to be undefined when transcluding via stdlib.h. +# +# This hack simply disables defining the mcontext_t typedefs, which +# has no negative effects on this version. +.if ${OPSYS} == "Darwin" && ${OPSYS_VERSION} < 100500 +CPPFLAGS+= -D_MCONTEXT_T=1 +CPPFLAGS+= -D_MCONTEXT64_T=1 +CPPFLAGS+= -D_UCONTEXT_T=1 +CPPFLAGS+= -D_UCONTEXT64_T=1 +.endif --_----------=_1699349791106130--