yasm: build fixes; rebuild for cygwin

yasm/001-debian-autoconf.patch

@@ -0,0 +1,29 @@
+From ee3bc62f621e2812824b86f3efdb05f4ead134ab Mon Sep 17 00:00:00 2001
+From: Peter Johnson <johnson.peter@gmail.com>
+Date: Fri, 9 Jul 2021 13:55:15 -0700
+Subject: [PATCH] Do not use AC_HEADER_STDC
+
+This fixes compatibility with autotools 2.70+
+---
+ configure.ac | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 01b61097f..2823ecd7d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,14 +101,8 @@ AM_WITH_DMALLOC
+ #
+ # Checks for header files.
+ #
+-AC_HEADER_STDC
+ AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h])
+ 
+-# REQUIRE standard C headers
+-if test "$ac_cv_header_stdc" != yes; then
+-	AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.])
+-fi
+-
+ #
+ # Checks for typedefs, structures, and compiler characteristics.
+ #

yasm/PKGBUILD

@@ -2,31 +2,36 @@
 
 pkgname=('yasm' 'yasm-devel')
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
 arch=('i686' 'x86_64')
 url="https://www.tortall.net/projects/yasm/"
 license=('BSD' 'GPL2' 'LGPL2.1' 'PerlArtistic')
 options=('staticlibs')
-makedepends=('autotools' 'gcc')
+makedepends=('autotools' 'gcc' 'xmlto')
 source=(https://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz
-        'msysize.patch'
-        'yasm-1.2.0-1.src.patch')
+        'yasm-1.2.0-1.src.patch'
+        '001-debian-autoconf.patch')
 sha256sums=('3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f'
-            'c29f0b53b13f8a3e16dbfb38c1f67ed281cdad9140447726bfcba321fe0f67ad'
-            '10a8dee681519d6fe14bf7f4dc9cb5b0f55cc7210c4e532e6939c4363cb0d3c0')
+            '10a8dee681519d6fe14bf7f4dc9cb5b0f55cc7210c4e532e6939c4363cb0d3c0'
+            '258af057cbf8fc055192552dc1b510f072ddb30c495502c00374c884347ec476')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/msysize.patch
   patch -p2 -i ${srcdir}/yasm-1.2.0-1.src.patch
 
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997338
+  patch -p1 -i ${srcdir}/001-debian-autoconf.patch
+
   autoreconf -fi
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --build=${CHOST}
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+  ./configure \
+    --prefix=/usr \
+    --build="${CYGWIN_CHOST}"
   make
   make DESTDIR="${srcdir}/dest" install
 }

yasm/msysize.patch

@@ -1,82 +0,0 @@
-diff -Naur yasm-1.3.0-orig/config/compile yasm-1.3.0/config/compile
---- yasm-1.3.0-orig/config/compile	2014-01-02 23:14:59.000000000 +0400
-+++ yasm-1.3.0/config/compile	2014-08-15 22:28:14.555600000 +0400
-@@ -53,7 +53,7 @@
- 	  MINGW*)
- 	    file_conv=mingw
- 	    ;;
--	  CYGWIN*)
-+	  CYGWIN*|MSYS*)
- 	    file_conv=cygwin
- 	    ;;
- 	  *)
-@@ -67,7 +67,7 @@
- 	mingw/*)
- 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- 	  ;;
--	cygwin/*)
-+	cygwin/*|msys/*)
- 	  file=`cygpath -m "$file" || echo "$file"`
- 	  ;;
- 	wine/*)
-diff -Naur yasm-1.3.0-orig/config/config.guess yasm-1.3.0/config/config.guess
---- yasm-1.3.0-orig/config/config.guess	2014-05-12 01:58:10.000000000 +0400
-+++ yasm-1.3.0/config/config.guess	2014-08-15 22:28:46.114400000 +0400
-@@ -844,6 +844,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur yasm-1.3.0-orig/config/config.rpath yasm-1.3.0/config/config.rpath
---- yasm-1.3.0-orig/config/config.rpath	2014-08-10 22:39:19.000000000 +0400
-+++ yasm-1.3.0/config/config.rpath	2014-08-15 22:30:10.136000000 +0400
-@@ -57,7 +57,7 @@
-     aix*)
-       wl='-Wl,'
-       ;;
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       ;;
-     hpux9* | hpux10* | hpux11*)
-       wl='-Wl,'
-@@ -149,7 +149,7 @@
- hardcode_minus_L=no
- 
- case "$host_os" in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -198,7 +198,7 @@
-         ld_shlibs=no
-       fi
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-@@ -348,7 +348,7 @@
-       ;;
-     bsdi[45]*)
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -537,7 +537,7 @@
-   bsdi[45]*)
-     library_names_spec='$libname$shrext'
-     ;;
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     shrext=.dll
-     library_names_spec='$libname.dll.a $libname.lib'
-     ;;