pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mk
Module Name: pkgsrc
Committed By: pho
Date: Mon Jan 13 03:10:07 UTC 2025
Modified Files:
pkgsrc/mk: haskell.mk
Log Message:
mk/haskell.mk: Fix build issues that happens when ${WRKDIR} has a trailing '/'
On Darwin ${TMPDIR} is not just "/tmp" but it's a long path something like
"/var/folders/.../", which ends with a slash symbol. This directory needs
to be listed in BUILDLINK_PASSTHRU_DIRS without the trailing slash,
otherwise packages using Template Haskell fail to build.
Due to an unrelated reason converters/pandoc still doesn't build on
Darwin. I have a fix locally, but I can't just commit it yet.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/mk/haskell.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.70 pkgsrc/mk/haskell.mk:1.71
--- pkgsrc/mk/haskell.mk:1.70 Wed May 8 12:12:28 2024
+++ pkgsrc/mk/haskell.mk Mon Jan 13 03:10:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.70 2024/05/08 12:12:28 pho Exp $
+# $NetBSD: haskell.mk,v 1.71 2025/01/13 03:10:07 pho Exp $
#
# This Makefile fragment handles Haskell Cabal packages. Package
# configuration, building, installation, registration and unregistration
@@ -330,7 +330,7 @@ CONFIGURE_ARGS+= --ghc-options=-optlm\ -
# /tmp/ghc_* must be protected from getting removed by our wrappers. We
# also want to be explicit about the path to be chosen for temporary files.
CONFIGURE_ARGS+= --ghc-options=-tmpdir\ ${TMPDIR:U/tmp:Q}
-BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR:U/tmp}
+BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR:U/tmp:S,/$$,,}
# Some packages lack PLIST but they may have things like PLIST.common.
.if empty(PLIST_SRC)
Home |
Main Index |
Thread Index |
Old Index