Merge pull request #3007 from lazka/libxslt-rebuild

libxslt: drop msysize patch

libxslt/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=libxslt
 pkgname=('libxslt' 'libxslt-devel')
 pkgver=1.1.35
-pkgrel=1
+pkgrel=2
 pkgdesc="XML stylesheet transformation library"
 arch=('i686' 'x86_64')
 url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis/"
@@ -12,11 +12,9 @@ makedepends=('gcc' 'libxml2-devel' 'libgcrypt-devel' 'autotools')
 checkdepends=('docbook-xml')
 options=('!libtool')
 source=("https://download.gnome.org/sources/libxslt/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz"
-        libxslt-1.1.32-msys2.patch
         libxslt.m4-libxslt-1.1.26.patch
         libxslt-cygwin-reentrant.patch)
 sha256sums=('8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79'
-            '0f17e189adf57b2ff4085049555b91ac4fd0a9b11dc1e8100cfb1e1f7938e877'
             'c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895'
             'f57629d5f2ce0ab441dc548fa023aee09780eb2940986a44b4423ba253e190bb')
 
@@ -25,7 +23,6 @@ prepare() {
 
   patch -p1 -i ${srcdir}/libxslt.m4-libxslt-1.1.26.patch
   patch -p1 -i ${srcdir}/libxslt-cygwin-reentrant.patch
-  patch -p1 -i ${srcdir}/libxslt-1.1.32-msys2.patch
 
   autoreconf -fi
 }
@@ -35,7 +32,11 @@ build() {
 
   CFLAGS+=" -fcommon"
   export lt_cv_deplibs_check_method='pass_all'
-  ./configure --build=${CHOST} --host=${CHOST} --target=${CHOST} \
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
+  ./configure \
+    --build=${CYGWIN_CHOST} \
+    --host=${CYGWIN_CHOST} \
+    --target=${CYGWIN_CHOST} \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \

libxslt/libxslt-1.1.32-msys2.patch

@@ -1,35 +0,0 @@
-diff -durN libxslt-1.1.32.orig/config.guess libxslt-1.1.32/config.guess
---- libxslt-1.1.32.orig/config.guess	2017-05-11 20:29:02.515625000 +0800
-+++ libxslt-1.1.32/config.guess	2017-05-11 20:48:19.640625000 +0800
-@@ -821,6 +821,9 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW64*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw64
- 	exit ;;
-@@ -867,6 +870,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- 	exit ;;
-diff -durN libxslt-1.1.29.orig/configure.ac libxslt-1.1.29/configure.ac
---- libxslt-1.1.32.orig/configure.ac	2017-05-11 20:29:03.953125000 +0800
-+++ libxslt-1.1.32/configure.ac	2017-05-11 20:50:04.625000000 +0800
-@@ -623,7 +623,7 @@
- AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH)
- 
- case "$host" in
-- *-*-cygwin*|*-*-mingw*)
-+ *-*-cygwin*|*-*-mingw*|*-*-msys*)
-  LDFLAGS="$LDFLAGS -no-undefined"
-  ;;
- esac