CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Aug 28 12:43:01 UTC 2025

Modified Files:
        pkgsrc/lang/ghc92: bootstrap.mk
        pkgsrc/lang/ghc94: bootstrap.mk
        pkgsrc/lang/ghc96: bootstrap.mk
        pkgsrc/lang/ghc98: bootstrap.mk

Log Message:
lang/ghc*: Remove cpp from USE_TOOLS

It was only there for OmniOS, and is no longer necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ghc92/bootstrap.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ghc94/bootstrap.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc96/bootstrap.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ghc98/bootstrap.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/ghc92/bootstrap.mk
diff -u pkgsrc/lang/ghc92/bootstrap.mk:1.4 pkgsrc/lang/ghc92/bootstrap.mk:1.5
--- pkgsrc/lang/ghc92/bootstrap.mk:1.4  Tue Jun  6 12:41:44 2023
+++ pkgsrc/lang/ghc92/bootstrap.mk      Thu Aug 28 12:43:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.4 2023/06/06 12:41:44 riastradh Exp $
+# $NetBSD: bootstrap.mk,v 1.5 2025/08/28 12:43:00 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -84,12 +84,6 @@ TOOL_DEPENDS+=       libiconv>=1.9.1:../../con
 TOOL_DEPENDS+= ncurses>=6.0:../../devel/ncurses
 .endif
 
-.if ${OPSYS} == "SunOS" && ${OS_VARIANT:U} == "OmniOS"
-# Also cpp is missing from /usr/bin. Why? This leads
-# ${WRKSRC}/libffi/configure to fail.
-TOOLS_PLATFORM.cpp=    /usr/lib/cpp
-.endif
-
 
 # -----------------------------------------------------------------------------
 # The "pre-configure" hook
@@ -97,7 +91,7 @@ TOOLS_PLATFORM.cpp=   /usr/lib/cpp
 # Install a bootstrapping compiler directly into TOOLS_DIR so that
 # ./configure can find it.
 #
-USE_TOOLS+=    gmake xzcat xz gtar cpp
+USE_TOOLS+=    gmake xzcat xz gtar
 
 pre-configure:
        ${RUN}${TEST} -f ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE} || \

Index: pkgsrc/lang/ghc94/bootstrap.mk
diff -u pkgsrc/lang/ghc94/bootstrap.mk:1.8 pkgsrc/lang/ghc94/bootstrap.mk:1.9
--- pkgsrc/lang/ghc94/bootstrap.mk:1.8  Thu Oct 12 07:51:09 2023
+++ pkgsrc/lang/ghc94/bootstrap.mk      Thu Aug 28 12:43:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.8 2023/10/12 07:51:09 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.9 2025/08/28 12:43:00 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis. See
 # ./files/BOOTSTRAP.md for details.
@@ -96,12 +96,6 @@ TOOL_DEPENDS+=       libiconv>=1.9.1:../../con
 TOOL_DEPENDS+= ncurses>=6.0:../../devel/ncurses
 .endif
 
-.if ${OPSYS} == "SunOS" && ${OS_VARIANT:U} == "OmniOS"
-# Also cpp is missing from /usr/bin. Why? This leads
-# ${WRKSRC}/libffi/configure to fail.
-TOOLS_PLATFORM.cpp=    /usr/lib/cpp
-.endif
-
 
 # -----------------------------------------------------------------------------
 # The "pre-configure" hook
@@ -109,7 +103,7 @@ TOOLS_PLATFORM.cpp= /usr/lib/cpp
 # Install a bootstrapping (stage-0) compiler directly into TOOLS_DIR so
 # that ./configure can find it.
 #
-USE_TOOLS+=    xzcat xz gtar cpp
+USE_TOOLS+=    xzcat xz gtar
 
 pre-configure:
        ${RUN}${TEST} -f ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE} || \

Index: pkgsrc/lang/ghc96/bootstrap.mk
diff -u pkgsrc/lang/ghc96/bootstrap.mk:1.3 pkgsrc/lang/ghc96/bootstrap.mk:1.4
--- pkgsrc/lang/ghc96/bootstrap.mk:1.3  Thu Nov 30 13:36:05 2023
+++ pkgsrc/lang/ghc96/bootstrap.mk      Thu Aug 28 12:43:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.3 2023/11/30 13:36:05 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.4 2025/08/28 12:43:01 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis. See
 # ./files/BOOTSTRAP.md for details.
@@ -83,12 +83,6 @@ PKG_FAIL_REASON+=    "internal error: unsup
 SITES.${i}?=   ${MASTER_SITE_LOCAL}
 .endfor
 
-.if ${OPSYS} == "SunOS" && ${OS_VARIANT:U} == "OmniOS"
-# Also cpp is missing from /usr/bin. Why? This leads
-# ${WRKSRC}/libffi/configure to fail.
-TOOLS_PLATFORM.cpp=    /usr/lib/cpp
-.endif
-
 
 # -----------------------------------------------------------------------------
 # The "pre-configure" hook
@@ -96,7 +90,7 @@ TOOLS_PLATFORM.cpp=   /usr/lib/cpp
 # Install a bootstrapping (stage-0) compiler directly into TOOLS_DIR so
 # that ./configure can find it.
 #
-USE_TOOLS+=    xzcat xz gtar cpp
+USE_TOOLS+=    xzcat xz gtar
 
 # Bootkits from the pre-Hadrian era has a different name for the top
 # directory in their archives. We can eliminate this conditional once all

Index: pkgsrc/lang/ghc98/bootstrap.mk
diff -u pkgsrc/lang/ghc98/bootstrap.mk:1.13 pkgsrc/lang/ghc98/bootstrap.mk:1.14
--- pkgsrc/lang/ghc98/bootstrap.mk:1.13 Mon Feb  3 16:25:01 2025
+++ pkgsrc/lang/ghc98/bootstrap.mk      Thu Aug 28 12:43:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.13 2025/02/03 16:25:01 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.14 2025/08/28 12:43:01 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis. See
 # ./files/BOOTSTRAP.md for details.
@@ -93,12 +93,6 @@ PKG_FAIL_REASON+=    "internal error: unsup
 SITES.${i}?=   ${MASTER_SITE_LOCAL}
 .endfor
 
-.if ${OPSYS} == "SunOS" && ${OS_VARIANT:U} == "OmniOS"
-# On this platform cpp(1) is missing from /usr/bin. Why? This leads
-# ${WRKSRC}/libffi/configure to fail.
-TOOLS_PLATFORM.cpp=    /usr/lib/cpp
-.endif
-
 
 # -----------------------------------------------------------------------------
 # The "pre-configure" hook
@@ -106,7 +100,7 @@ TOOLS_PLATFORM.cpp= /usr/lib/cpp
 # Install a bootstrapping (stage-0) compiler directly into TOOLS_DIR so
 # that ./configure can find it.
 #
-USE_TOOLS+=    xzcat xz cpp gtar patch
+USE_TOOLS+=    xzcat xz gtar patch
 # - patch is for bootstrap.py
 # - gtar isn't strictly necessary, but we need a tar(1) implementation
 #   supporting --use-compress-program (see