CVS commit: pkgsrc/lang/ghc910

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Feb  3 16:09:10 UTC 2025

Modified Files:
        pkgsrc/lang/ghc910: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/lang/ghc910/patches:
            patch-utils_ghc-toolchain_src_GHC_Toolchain_Program.hs

Log Message:
lang/ghc910: Prevent ${WRAPPER_DIR} from getting hardcoded in the compiler


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc910/Makefile \
    pkgsrc/lang/ghc910/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ghc910/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc910/patches/patch-utils_ghc-toolchain_src_GHC_Toolchain_Program.hs

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

Modified files:

Index: pkgsrc/lang/ghc910/Makefile
diff -u pkgsrc/lang/ghc910/Makefile:1.2 pkgsrc/lang/ghc910/Makefile:1.3
--- pkgsrc/lang/ghc910/Makefile:1.2     Wed Jan 29 15:28:29 2025
+++ pkgsrc/lang/ghc910/Makefile Mon Feb  3 16:09:09 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2025/01/29 15:28:29 pho Exp $
+# $NetBSD: Makefile,v 1.3 2025/02/03 16:09:09 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=      ghc-9.10.1-src
 PKGNAME=       ${DISTNAME:S/-src$//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -78,9 +78,9 @@ CONFIGURE_ARGS.common+= \
 
 # We must pass non-wrapper tools to ./configure because they will be
 # embedded in the compiler (actually ${WRKSRC}/settings).
-CONFIGURE_ENV+=                ac_cv_prog_fp_prog_ar=${AR:Q}
-CONFIGURE_ENV+=                ac_cv_prog_LIBTOOL=libtool
+
 CONFIGURE_ARGS.common+=        LD=${LD:Q}
+CONFIGURE_ENV+=                MergeObjsCmd=${LD:Q}
 
 # While we use binutils ar which supports "@", this appears to be leaking
 # somewhere into assuming that SunOS ld also supports "@" which it does not.
Index: pkgsrc/lang/ghc910/buildlink3.mk
diff -u pkgsrc/lang/ghc910/buildlink3.mk:1.2 pkgsrc/lang/ghc910/buildlink3.mk:1.3
--- pkgsrc/lang/ghc910/buildlink3.mk:1.2        Wed Jan 29 15:28:29 2025
+++ pkgsrc/lang/ghc910/buildlink3.mk    Mon Feb  3 16:09:09 2025
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2025/01/29 15:28:29 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/02/03 16:09:09 pho Exp $
 
 BUILDLINK_TREE+=       ghc
 
 .if !defined(GHC_BUILDLINK3_MK)
 GHC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.10.1nb1
-BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.10.1nb1
+BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.10.1nb2
+BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.10.1nb2
 BUILDLINK_PKGSRCDIR.ghc?=      ../../lang/ghc910
 
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/lang/ghc910/distinfo
diff -u pkgsrc/lang/ghc910/distinfo:1.4 pkgsrc/lang/ghc910/distinfo:1.5
--- pkgsrc/lang/ghc910/distinfo:1.4     Sun Feb  2 16:21:31 2025
+++ pkgsrc/lang/ghc910/distinfo Mon Feb  3 16:09:09 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2025/02/02 16:21:31 pho Exp $
+$NetBSD: distinfo,v 1.5 2025/02/03 16:09:09 pho Exp $
 
 BLAKE2s (ghc-9.10.1-src.tar.xz) = 7e4433ead6349bd073d31803b63e6c39fb3833ad691e985e25bc5b027da7fb85
 SHA512 (ghc-9.10.1-src.tar.xz) = 46d47e7811a19dcce501002ab674d84ab2fcb842309b5094af52dc5ad26bf5b309b160c1b689f3342666013bf4b0587425c60fbd6c637e739839d41a6a96d990
@@ -61,5 +61,6 @@ SHA1 (patch-libraries_unix_System_Posix_
 SHA1 (patch-libraries_unix_System_Posix_User_ByteString.hsc) = 2a331de2292835ae6904980facd8201705fa63e8
 SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94
 SHA1 (patch-rts_rts.cabal) = 6ccf9c3a184e9ffe651fcbc9f1d05504c17aeb1a
+SHA1 (patch-utils_ghc-toolchain_src_GHC_Toolchain_Program.hs) = 15ceb99949d549dbf44ec19f0d7197c5c954981c
 SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067
 SHA1 (patch-utils_haddock_haddock.cabal) = c8a244f2f341b736b65b218590d1a3a8309f55ba

Added files:

Index: pkgsrc/lang/ghc910/patches/patch-utils_ghc-toolchain_src_GHC_Toolchain_Program.hs
diff -u /dev/null pkgsrc/lang/ghc910/patches/patch-utils_ghc-toolchain_src_GHC_Toolchain_Program.hs:1.1
--- /dev/null   Mon Feb  3 16:09:10 2025
+++ pkgsrc/lang/ghc910/patches/patch-utils_ghc-toolchain_src_GHC_Toolchain_Program.hs   Mon Feb  3 16:09:09 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-utils_ghc-toolchain_src_GHC_Toolchain_Program.hs,v 1.1 2025/02/03 16:09:09 pho Exp $
+
+Do not resolve command names to absolute paths. Usually it's the right
+thing but in pkgsrc it causes problems because, say, --ld=ld gets
+transformed to ${WRAPPER_DIR}/bin/ld and baked into
+${PREFIX}/lib/${PKGNAME_NOREV}/lib/settings.
+
+Definitely not eligible for upstreaming.
+
+--- utils/ghc-toolchain/src/GHC/Toolchain/Program.hs.orig      2025-02-03 15:03:27.810854587 +0000
++++ utils/ghc-toolchain/src/GHC/Toolchain/Program.hs
+@@ -160,7 +160,7 @@ findProgram description userSpec candida
+           r <- liftIO $ findExecutable name
+           case r of
+             Nothing -> throwE $ name ++ " not found in search path"
+-            Just x -> return x
++            Just x -> return name
+ 
+ -------------------- Compiling utilities --------------------
+