pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang ghc: Only some ghc compilers support NetBSD/aarch...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6914afa9693f
branches:  trunk
changeset: 388555:6914afa9693f
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Nov 22 14:52:43 2022 +0000

description:
ghc: Only some ghc compilers support NetBSD/aarch64, limit the workaround

diffstat:

 lang/ghc7/Makefile   |  7 ++-----
 lang/ghc80/Makefile  |  7 ++-----
 lang/ghc810/Makefile |  7 ++-----
 lang/ghc84/Makefile  |  7 ++-----
 lang/ghc88/Makefile  |  7 ++-----
 5 files changed, 10 insertions(+), 25 deletions(-)

diffs (105 lines):

diff -r 3516ec85fc7b -r 6914afa9693f lang/ghc7/Makefile
--- a/lang/ghc7/Makefile        Tue Nov 22 14:35:32 2022 +0000
+++ b/lang/ghc7/Makefile        Tue Nov 22 14:52:43 2022 +0000
@@ -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 @@
 # 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
diff -r 3516ec85fc7b -r 6914afa9693f lang/ghc80/Makefile
--- a/lang/ghc80/Makefile       Tue Nov 22 14:35:32 2022 +0000
+++ b/lang/ghc80/Makefile       Tue Nov 22 14:52:43 2022 +0000
@@ -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 @@
 # 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
diff -r 3516ec85fc7b -r 6914afa9693f lang/ghc810/Makefile
--- a/lang/ghc810/Makefile      Tue Nov 22 14:35:32 2022 +0000
+++ b/lang/ghc810/Makefile      Tue Nov 22 14:52:43 2022 +0000
@@ -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 @@
 # 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
diff -r 3516ec85fc7b -r 6914afa9693f lang/ghc84/Makefile
--- a/lang/ghc84/Makefile       Tue Nov 22 14:35:32 2022 +0000
+++ b/lang/ghc84/Makefile       Tue Nov 22 14:52:43 2022 +0000
@@ -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 @@
 # 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
diff -r 3516ec85fc7b -r 6914afa9693f lang/ghc88/Makefile
--- a/lang/ghc88/Makefile       Tue Nov 22 14:35:32 2022 +0000
+++ b/lang/ghc88/Makefile       Tue Nov 22 14:52:43 2022 +0000
@@ -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 @@
 # 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



Home | Main Index | Thread Index | Old Index