summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2020-04-20 10:00:54 +0000
committerdsainty <dsainty@pkgsrc.org>2020-04-20 10:00:54 +0000
commit0406fa6e6369a9f83a93e34d482d1199a0d9557f (patch)
treeaf772e61d1f01a504174d9bae9a8410b77527e79
parent5e493d1e1cb1b35cf913e453be9ba8c14dac2bcf (diff)
downloadpkgsrc-0406fa6e6369a9f83a93e34d482d1199a0d9557f.tar.gz
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.
-rw-r--r--devel/libffi/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 112d240cf53..c9b90efc955 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -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.