Received: by mail.netbsd.org (Postfix, from userid 605) id 6262B84D9B; Tue, 22 Nov 2022 14:35:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 925F184D28 for ; Tue, 22 Nov 2022 14:35:34 +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 e5T3P6rxnYVp for ; Tue, 22 Nov 2022 14:35:33 +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 4962A84CE8 for ; Tue, 22 Nov 2022 14:35:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 36825FA90; Tue, 22 Nov 2022 14:35:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1669127733131910" MIME-Version: 1.0 Date: Tue, 22 Nov 2022 14:35:33 +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: <20221122143533.36825FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1669127733131910 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:35:33 UTC 2022 Modified Files: pkgsrc/lang/ghc7: Makefile pkgsrc/lang/ghc80: Makefile pkgsrc/lang/ghc810: Makefile pkgsrc/lang/ghc84: Makefile pkgsrc/lang/ghc88: Makefile pkgsrc/lang/ghc90: Makefile pkgsrc/lang/ghc92: Makefile Log Message: ghc: depend on compat90 instead of compat80 on NetBSD/aarch64 There was never a NetBSD 8 release for aarch64 so compat80 is not available, but compat90 will work nicely. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 pkgsrc/lang/ghc7/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/ghc80/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/ghc810/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/ghc84/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/ghc88/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/ghc90/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/ghc92/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1669127733131910 Content-Disposition: inline Content-Length: 10533 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.53 pkgsrc/lang/ghc7/Makefile:1.54 --- pkgsrc/lang/ghc7/Makefile:1.53 Tue Jun 28 11:34:12 2022 +++ pkgsrc/lang/ghc7/Makefile Tue Nov 22 14:35:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2022/06/28 11:34:12 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2022/11/22 14:35:32 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -177,12 +177,16 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../.. # NetBSD 9.x have libcurses with a newer major version than the # bootstrap kit is linked against. For now, work around this with -# compat80. -.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 -BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 +# compat libraries. +# # In a sandboxed build environment, we have to reach over to the -# installed libraries themselves, since the symlinks compat80 adds +# 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 +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.19 pkgsrc/lang/ghc80/Makefile:1.20 --- pkgsrc/lang/ghc80/Makefile:1.19 Mon Oct 31 23:19:47 2022 +++ pkgsrc/lang/ghc80/Makefile Tue Nov 22 14:35:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2022/10/31 23:19:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.20 2022/11/22 14:35:32 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -177,12 +177,16 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # NetBSD 9.x have libcurses with a newer major version than the # bootstrap kit is linked against. For now, work around this with -# compat80. -.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 -BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 +# compat libraries. +# # In a sandboxed build environment, we have to reach over to the -# installed libraries themselves, since the symlinks compat80 adds +# 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 +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.14 pkgsrc/lang/ghc810/Makefile:1.15 --- pkgsrc/lang/ghc810/Makefile:1.14 Mon Oct 31 23:19:47 2022 +++ pkgsrc/lang/ghc810/Makefile Tue Nov 22 14:35:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2022/10/31 23:19:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.15 2022/11/22 14:35:32 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -219,12 +219,16 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # NetBSD 9.x have libcurses with a newer major version than the # bootstrap kit is linked against. For now, work around this with -# compat80. -.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 -BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 +# compat libraries. +# # In a sandboxed build environment, we have to reach over to the -# installed libraries themselves, since the symlinks compat80 adds +# 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 +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.21 pkgsrc/lang/ghc84/Makefile:1.22 --- pkgsrc/lang/ghc84/Makefile:1.21 Mon Oct 31 23:19:47 2022 +++ pkgsrc/lang/ghc84/Makefile Tue Nov 22 14:35:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2022/10/31 23:19:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2022/11/22 14:35:32 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -195,12 +195,16 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # NetBSD 9.x have libcurses with a newer major version than the # bootstrap kit is linked against. For now, work around this with -# compat80. -.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 -BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 +# compat libraries. +# # In a sandboxed build environment, we have to reach over to the -# installed libraries themselves, since the symlinks compat80 adds +# 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 +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.27 pkgsrc/lang/ghc88/Makefile:1.28 --- pkgsrc/lang/ghc88/Makefile:1.27 Mon Oct 31 23:19:47 2022 +++ pkgsrc/lang/ghc88/Makefile Tue Nov 22 14:35:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2022/10/31 23:19:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.28 2022/11/22 14:35:32 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -219,12 +219,16 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # NetBSD 9.x have libcurses with a newer major version than the # bootstrap kit is linked against. For now, work around this with -# compat80. -.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 -BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 +# compat libraries. +# # In a sandboxed build environment, we have to reach over to the -# installed libraries themselves, since the symlinks compat80 adds +# 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 +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 # libterminfo.so.1. See ./bootstrap.mk Index: pkgsrc/lang/ghc90/Makefile diff -u pkgsrc/lang/ghc90/Makefile:1.22 pkgsrc/lang/ghc90/Makefile:1.23 --- pkgsrc/lang/ghc90/Makefile:1.22 Mon Oct 31 23:19:47 2022 +++ pkgsrc/lang/ghc90/Makefile Tue Nov 22 14:35:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2022/10/31 23:19:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.23 2022/11/22 14:35:32 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -234,12 +234,16 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # NetBSD 9.x have libcurses with a newer major version than the # bootstrap kit is linked against. For now, work around this with -# compat80. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000 -BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 +# compat libraries. +# # In a sandboxed build environment, we have to reach over to the -# installed libraries themselves, since the symlinks compat80 adds +# 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 !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${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 # libterminfo.so.1. See ./bootstrap.mk Index: pkgsrc/lang/ghc92/Makefile diff -u pkgsrc/lang/ghc92/Makefile:1.9 pkgsrc/lang/ghc92/Makefile:1.10 --- pkgsrc/lang/ghc92/Makefile:1.9 Mon Oct 31 23:19:47 2022 +++ pkgsrc/lang/ghc92/Makefile Tue Nov 22 14:35:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/10/31 23:19:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2022/11/22 14:35:32 nia Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -235,12 +235,16 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0 # NetBSD 9.x have libcurses with a newer major version than the # bootstrap kit is linked against. For now, work around this with -# compat80. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000 -BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 +# compat libraries. +# # In a sandboxed build environment, we have to reach over to the -# installed libraries themselves, since the symlinks compat80 adds +# 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 !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${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 # libterminfo.so.1. See ./bootstrap.mk --_----------=_1669127733131910--