CVS commit: pkgsrc/devel/libffi

["David Sainty" <dsainty%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dsainty
Date:           Mon Apr 20 10:00:54 UTC 2020

Modified Files:
        pkgsrc/devel/libffi: Makefile

Log Message:
Use bash for this build unconditionally, the difficulty in parsing the shell
script is not limited to Irix.

Fixes the build when using ksh (on MacOS) as the preferred shell.

No version bump, this change only repairs outright build failures.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/libffi/Makefile

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

Modified files:

Index: pkgsrc/devel/libffi/Makefile
diff -u pkgsrc/devel/libffi/Makefile:1.40 pkgsrc/devel/libffi/Makefile:1.41
--- pkgsrc/devel/libffi/Makefile:1.40   Wed Apr  8 13:40:10 2020
+++ pkgsrc/devel/libffi/Makefile        Mon Apr 20 10:00:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2020/04/08 13:40:10 tnn Exp $
+# $NetBSD: Makefile,v 1.41 2020/04/20 10:00:54 dsainty Exp $
 
 DISTNAME=      libffi-3.3
 PKGREVISION=   2
@@ -41,11 +41,10 @@ LIBS+=              -lm68k
 CPPFLAGS+=     -D__PIC__
 .endif
 
-# irix fixes from PR 48587
-.if ${OPSYS} == IRIX
-USE_TOOLS+=            bash
+# Irix fixes from PR 48587, but also ensures compatibility with other shells.
+# Ksh also has difficulty parsing the shell scripts patched as part of this PR.
+USE_TOOLS+=            bash:build
 MAKE_FLAGS+=           SHELL=${TOOLS_DIR}/bin/bash
-.endif
 
 # On platforms where ld(1) is LLVM ld, relocations against read-only
 # segments has to be explicitly allowed.