Received: by mail.netbsd.org (Postfix, from userid 605) id B52B984E60; Tue, 22 Nov 2022 14:52:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E6FAC84D28 for ; Tue, 22 Nov 2022 14:52:44 +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 TU4ii6xNUPky for ; Tue, 22 Nov 2022 14:52:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 22D5584CE8 for ; Tue, 22 Nov 2022 14:52:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1C123FA90; Tue, 22 Nov 2022 14:52:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1669128764280630" MIME-Version: 1.0 Date: Tue, 22 Nov 2022 14:52:44 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20221122145244.1C123FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1669128764280630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Nov 22 14:52:44 UTC 2022 Modified Files: pkgsrc/lang/ghc7: Makefile pkgsrc/lang/ghc80: Makefile pkgsrc/lang/ghc810: Makefile pkgsrc/lang/ghc84: Makefile pkgsrc/lang/ghc88: Makefile Log Message: ghc: Only some ghc compilers support NetBSD/aarch64, limit the workaround To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/ghc7/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/ghc80/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/ghc810/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/ghc84/Makefile cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/ghc88/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1669128764280630 Content-Disposition: inline Content-Length: 5808 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ghc7/Makefile diff -u pkgsrc/lang/ghc7/Makefile:1.54 pkgsrc/lang/ghc7/Makefile:1.55 --- pkgsrc/lang/ghc7/Makefile:1.54 Tue Nov 22 14:35:32 2022 +++ pkgsrc/lang/ghc7/Makefile Tue Nov 22 14:52:43 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2022/11/22 14:35:32 nia Exp $ +# $NetBSD: Makefile,v 1.55 2022/11/22 14:52:43 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -182,10 +182,7 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../.. # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compatXX adds # to the /usr tree can't be applied. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000 -BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90 -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib -.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib .endif Index: pkgsrc/lang/ghc80/Makefile diff -u pkgsrc/lang/ghc80/Makefile:1.20 pkgsrc/lang/ghc80/Makefile:1.21 --- pkgsrc/lang/ghc80/Makefile:1.20 Tue Nov 22 14:35:32 2022 +++ pkgsrc/lang/ghc80/Makefile Tue Nov 22 14:52:43 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2022/11/22 14:35:32 nia Exp $ +# $NetBSD: Makefile,v 1.21 2022/11/22 14:52:43 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -182,10 +182,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compatXX adds # to the /usr tree can't be applied. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000 -BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90 -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib -.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib .endif Index: pkgsrc/lang/ghc810/Makefile diff -u pkgsrc/lang/ghc810/Makefile:1.15 pkgsrc/lang/ghc810/Makefile:1.16 --- pkgsrc/lang/ghc810/Makefile:1.15 Tue Nov 22 14:35:32 2022 +++ pkgsrc/lang/ghc810/Makefile Tue Nov 22 14:52:43 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2022/11/22 14:35:32 nia Exp $ +# $NetBSD: Makefile,v 1.16 2022/11/22 14:52:43 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -224,10 +224,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compatXX adds # to the /usr tree can't be applied. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000 -BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90 -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib -.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib .endif Index: pkgsrc/lang/ghc84/Makefile diff -u pkgsrc/lang/ghc84/Makefile:1.22 pkgsrc/lang/ghc84/Makefile:1.23 --- pkgsrc/lang/ghc84/Makefile:1.22 Tue Nov 22 14:35:32 2022 +++ pkgsrc/lang/ghc84/Makefile Tue Nov 22 14:52:43 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/11/22 14:35:32 nia Exp $ +# $NetBSD: Makefile,v 1.23 2022/11/22 14:52:43 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -200,10 +200,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compatXX adds # to the /usr tree can't be applied. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000 -BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90 -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib -.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib .endif Index: pkgsrc/lang/ghc88/Makefile diff -u pkgsrc/lang/ghc88/Makefile:1.28 pkgsrc/lang/ghc88/Makefile:1.29 --- pkgsrc/lang/ghc88/Makefile:1.28 Tue Nov 22 14:35:32 2022 +++ pkgsrc/lang/ghc88/Makefile Tue Nov 22 14:52:43 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2022/11/22 14:35:32 nia Exp $ +# $NetBSD: Makefile,v 1.29 2022/11/22 14:52:43 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -224,10 +224,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compatXX adds # to the /usr tree can't be applied. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000 -BUILD_DEPENDS+= compat90-[0-9]*:../../emulators/compat90 -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib -.elif ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib # XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having --_----------=_1669128764280630--