CVS commit: pkgsrc/devel/libffi

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

Module Name:    pkgsrc
Committed By:   dsainty
Date:           Fri Apr 24 10:19:32 UTC 2020

Modified Files:
        pkgsrc/devel/libffi: Makefile distinfo
        pkgsrc/devel/libffi/patches: patch-configure

Log Message:
Revert portions of PR/48587 - applied in 2014 to resolve some issue
with building on Irix.  The changes applied to 'configure' introduce
some quite ugly quote nesting that not all shells (E.g. ksh) can
comprehend.

After discussion, prefer to roll back what looks like undesirable and
unnecessary changes, and drop the 'bash' dependency.  My suspicion is
that the old 'configure' patch is unhelpful even for Irix.

The reason for the PR/48587 changes are not clear, given that part of
that patch also selected 'bash' as the shell to use - which should
have made editing the script unnecessary in the first place.

Demonstrating the problem bringing all this to attention, this is what
happens if you are using ksh as the Pkgsrc shell on MacOS X:

===> Building for libffi-3.3nb2
/bin/ksh: : cannot execute [Is a directory]
<hangs>

The cause is this ugly looking quote nesting that was introduced by
patch-configure in PR/48587...

$ BUILD="` grep "^#### $HOST " Makefile | sed -e 's/.*|//' `"
ksh: : cannot execute [Is a directory]
^C
% bash
bash-5.0$ BUILD="` grep "^#### $$HOST " Makefile | sed -e 's/.*|//' `"
bash-5.0$ exit
% sh
sh-3.2$ BUILD="` grep "^#### $$HOST " Makefile | sed -e 's/.*|//' `"
sh-3.2$ exit

Removing patch-configure results in this much simpler, portable looking
script:

$ BUILD=` grep "^#### $$HOST " Makefile | sed -e 's/.*|//' `

No PKGREVISION bump, this change is not anticipated to affect the
package contents, only the success or failure of the build.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/libffi/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libffi/patches/patch-configure

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.41 pkgsrc/devel/libffi/Makefile:1.42
--- pkgsrc/devel/libffi/Makefile:1.41   Mon Apr 20 10:00:54 2020
+++ pkgsrc/devel/libffi/Makefile        Fri Apr 24 10:19:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/04/20 10:00:54 dsainty Exp $
+# $NetBSD: Makefile,v 1.42 2020/04/24 10:19:32 dsainty Exp $
 
 DISTNAME=      libffi-3.3
 PKGREVISION=   2
@@ -41,11 +41,6 @@ LIBS+=               -lm68k
 CPPFLAGS+=     -D__PIC__
 .endif
 
-# 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
-
 # On platforms where ld(1) is LLVM ld, relocations against read-only
 # segments has to be explicitly allowed.
 .if !empty(MACHINE_PLATFORM:MFreeBSD-1[2-9].*-*)

Index: pkgsrc/devel/libffi/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.53 pkgsrc/devel/libffi/distinfo:1.54
--- pkgsrc/devel/libffi/distinfo:1.53   Wed Apr  8 13:40:10 2020
+++ pkgsrc/devel/libffi/distinfo        Fri Apr 24 10:19:32 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.53 2020/04/08 13:40:10 tnn Exp $
+$NetBSD: distinfo,v 1.54 2020/04/24 10:19:32 dsainty Exp $
 
 SHA1 (libffi-3.3.tar.gz) = 8df6cb570c8d6596a67d1c0773bf00650154f7aa
 RMD160 (libffi-3.3.tar.gz) = 2cd43b66d792f1bad76df2e19a8411beacfcb8e0
 SHA512 (libffi-3.3.tar.gz) = 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 Size (libffi-3.3.tar.gz) = 1305466 bytes
-SHA1 (patch-configure) = 81f1f2bee39a40f2a34b3a6cea0b210d13037482
+SHA1 (patch-configure) = 604b205963e01c2dce7d5636543920abdd9c8638
 SHA1 (patch-configure_host) = 94678e6c264ee116c339eb92f840909a663f28f7
 SHA1 (patch-src_aarch64_ffi.c) = c5bd73abcb7445b073eb3e61feda212ee3396246
 SHA1 (patch-src_arm_sysv.S) = 9aaa8e12e627d68126fbc4ff02e06ed45c94da1a

Index: pkgsrc/devel/libffi/patches/patch-configure
diff -u pkgsrc/devel/libffi/patches/patch-configure:1.1 pkgsrc/devel/libffi/patches/patch-configure:1.2
--- pkgsrc/devel/libffi/patches/patch-configure:1.1     Wed Feb 26 19:15:44 2020
+++ pkgsrc/devel/libffi/patches/patch-configure Fri Apr 24 10:19:32 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2020/02/26 19:15:44 adam Exp $
+$NetBSD: patch-configure,v 1.2 2020/04/24 10:19:32 dsainty Exp $
 
 Add NetBSD support.
 
@@ -13,23 +13,3 @@ Add NetBSD support.
  
  $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
  
-@@ -20978,13 +20978,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a
- /-all-all/d
- a\\
-       @ HOST="\$(HOST)\" \\\\\\
--      ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\
--      ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
--      ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\
--      ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq "0" ; then : \\\\\\
--      ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\
-+      ; test ".\$\$HOST" = "." && HOST="$x sh $ax_enable_builddir_auxdir/config.guess $x" \\\\\\
-+      ; BUILD="$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x" \\\\\\
-+      ; use="$x basename "\$\@" -all $x"; n="$x echo \$\$BUILD | wc -w $x" \\\\\\
-+      ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test \$\$n = "0" ; then : \\\\\\
-+      ; BUILD="$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x" ; fi \\\\\\
-       ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\
--      ; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\
-+      ; test "\$\$use" = "\$\@" && BUILD="$x echo "\$\$BUILD" | tail -1 $x" \\\\\\
-       ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\
-       ; (cd "\$\$i" && test ! -f configure && \$(MAKE) \$\$use) || exit; done
- /dist-all *:/a\\