[pkgsrc/trunk]: pkgsrc/lang ghc: depend on compat90 instead of compat80 on Ne...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang ghc: depend on compat90 instead of compat80 on Ne...
From: nia <nia%pkgsrc.org@localhost>
Date: Tue, 22 Nov 2022 15:56:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/3516ec85fc7b
branches:  trunk
changeset: 388554:3516ec85fc7b
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Nov 22 14:35:32 2022 +0000

description:
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.

diffstat:

 lang/ghc7/Makefile   |  16 ++++++++++------
 lang/ghc80/Makefile  |  16 ++++++++++------
 lang/ghc810/Makefile |  16 ++++++++++------
 lang/ghc84/Makefile  |  16 ++++++++++------
 lang/ghc88/Makefile  |  16 ++++++++++------
 lang/ghc90/Makefile  |  16 ++++++++++------
 lang/ghc92/Makefile  |  16 ++++++++++------
 7 files changed, 70 insertions(+), 42 deletions(-)

diffs (217 lines):

diff -r ec0120dee541 -r 3516ec85fc7b lang/ghc7/Makefile
--- a/lang/ghc7/Makefile        Tue Nov 22 14:13:23 2022 +0000
+++ b/lang/ghc7/Makefile        Tue Nov 22 14:35:32 2022 +0000
@@ -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 @@
 
 # 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
+# compat libraries.
+#
+# 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
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
-# In a sandboxed build environment, we have to reach over to the
-# installed libraries themselves, since the symlinks compat80 adds
-# to the /usr tree can't be applied.
 ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib
 .endif
 
diff -r ec0120dee541 -r 3516ec85fc7b lang/ghc80/Makefile
--- a/lang/ghc80/Makefile       Tue Nov 22 14:13:23 2022 +0000
+++ b/lang/ghc80/Makefile       Tue Nov 22 14:35:32 2022 +0000
@@ -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 @@
 
 # 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
+# compat libraries.
+#
+# 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
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
-# In a sandboxed build environment, we have to reach over to the
-# installed libraries themselves, since the symlinks compat80 adds
-# to the /usr tree can't be applied.
 ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 .endif
 
diff -r ec0120dee541 -r 3516ec85fc7b lang/ghc810/Makefile
--- a/lang/ghc810/Makefile      Tue Nov 22 14:13:23 2022 +0000
+++ b/lang/ghc810/Makefile      Tue Nov 22 14:35:32 2022 +0000
@@ -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 @@
 
 # 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
+# compat libraries.
+#
+# 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
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
-# In a sandboxed build environment, we have to reach over to the
-# installed libraries themselves, since the symlinks compat80 adds
-# to the /usr tree can't be applied.
 ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 .endif
 
diff -r ec0120dee541 -r 3516ec85fc7b lang/ghc84/Makefile
--- a/lang/ghc84/Makefile       Tue Nov 22 14:13:23 2022 +0000
+++ b/lang/ghc84/Makefile       Tue Nov 22 14:35:32 2022 +0000
@@ -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 @@
 
 # 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
+# compat libraries.
+#
+# 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
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
-# In a sandboxed build environment, we have to reach over to the
-# installed libraries themselves, since the symlinks compat80 adds
-# to the /usr tree can't be applied.
 ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 .endif
 
diff -r ec0120dee541 -r 3516ec85fc7b lang/ghc88/Makefile
--- a/lang/ghc88/Makefile       Tue Nov 22 14:13:23 2022 +0000
+++ b/lang/ghc88/Makefile       Tue Nov 22 14:35:32 2022 +0000
@@ -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 @@
 
 # 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
+# compat libraries.
+#
+# 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
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
-# In a sandboxed build environment, we have to reach over to the
-# installed libraries themselves, since the symlinks compat80 adds
-# to the /usr tree can't be applied.
 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
diff -r ec0120dee541 -r 3516ec85fc7b lang/ghc90/Makefile
--- a/lang/ghc90/Makefile       Tue Nov 22 14:13:23 2022 +0000
+++ b/lang/ghc90/Makefile       Tue Nov 22 14:35:32 2022 +0000
@@ -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 @@
 
 # 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
+# compat libraries.
+#
+# 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 !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
-# In a sandboxed build environment, we have to reach over to the
-# installed libraries themselves, since the symlinks compat80 adds
-# to the /usr tree can't be applied.
 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
diff -r ec0120dee541 -r 3516ec85fc7b lang/ghc92/Makefile
--- a/lang/ghc92/Makefile       Tue Nov 22 14:13:23 2022 +0000
+++ b/lang/ghc92/Makefile       Tue Nov 22 14:35:32 2022 +0000
@@ -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 @@
 
 # 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
+# compat libraries.
+#
+# 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 !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
-# In a sandboxed build environment, we have to reach over to the
-# installed libraries themselves, since the symlinks compat80 adds
-# to the /usr tree can't be applied.
 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
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/geeqie graphics/geeqie: Redo patch-ac (UB avo...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang ghc: Only some ghc compilers support NetBSD/aarch...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/geeqie graphics/geeqie: Redo patch-ac (UB avo...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang ghc: Only some ghc compilers support NetBSD/aarch...
Indexes:
Home | Main Index | Thread Index | Old Index