CVS commit: pkgsrc/lang

["Nia Alarie" <nia%netbsd.org@localhost>]

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.

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