pkgsrc-Changes archive

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

CVS commit: pkgsrc/lang/ghc98



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Jun 22 12:16:40 UTC 2024

Modified Files:
        pkgsrc/lang/ghc98: buildlink3.mk

Log Message:
ghc98: Attempt to fix dependencies on Darwin.

With libiconv being included but overridden with PREFER=native in the main
package, this ends up breaking dependencies as they expect the libiconv package
to be installed.

For now just exclude the libiconv include in the bl3, but this could really do
with a cleaner fix.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc98/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc98/buildlink3.mk
diff -u pkgsrc/lang/ghc98/buildlink3.mk:1.2 pkgsrc/lang/ghc98/buildlink3.mk:1.3
--- pkgsrc/lang/ghc98/buildlink3.mk:1.2 Sun Apr 28 16:23:44 2024
+++ pkgsrc/lang/ghc98/buildlink3.mk     Sat Jun 22 12:16:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2024/04/28 16:23:44 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2024/06/22 12:16:40 jperkin Exp $
 
 BUILDLINK_TREE+=       ghc
 
@@ -9,7 +9,13 @@ BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.8.2
 BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.8.2nb1
 BUILDLINK_PKGSRCDIR.ghc?=      ../../lang/ghc98
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+# A regrettable hack.  See Makefile for background.
+.if ${OPSYS} != "Darwin"
 .include "../../converters/libiconv/buildlink3.mk"
+.endif
+
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"



Home | Main Index | Thread Index | Old Index