Source-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/libffi Use bash for this build unconditionally, ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfc52bccab5d
branches:  trunk
changeset: 429451:dfc52bccab5d
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Mon Apr 20 10:00:54 2020 +0000

description:
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.

diffstat:

 devel/libffi/Makefile |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (24 lines):

diff -r 3dfdac3fa5d8 -r dfc52bccab5d devel/libffi/Makefile
--- a/devel/libffi/Makefile     Mon Apr 20 08:37:34 2020 +0000
+++ b/devel/libffi/Makefile     Mon Apr 20 10:00:54 2020 +0000
@@ -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 @@
 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.



Home | Main Index | Thread Index | Old Index