Merge pull request #4265 from lazka/npth-rebuild-2023-12-13

npth: rebuild

npth/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=npth
 pkgname=('libnpth' 'libnpth-devel')
 pkgver=1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="New portable threads library"
 arch=('i686' 'x86_64')
 url="https://gnupg.org/"
@@ -12,26 +12,25 @@ depends=('gcc-libs')
 makedepends=('autotools' 'gcc')
 options=('!libtool' '!emptydirs')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6')
-source=(https://gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig}
-        npth-1.2-msysize.patch)
+source=(https://gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig})
 sha256sums=('1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1'
-            'SKIP'
-            '6d08197e74f2c13a36d2f25bd5abb8b3708e52d1d5050f4ff2bdd6ff9c74c00d')
+            'SKIP')
 
 prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  patch -p1 -i ${srcdir}/npth-1.2-msysize.patch
 
   autoreconf -fiv
 }
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
+
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
-    --build=${CHOST} \
-    --host=${CHOST} \
-    --target=${CHOST} \
+    --build=${CYGWIN_CHOST} \
+    --host=${CYGWIN_CHOST} \
+    --target=${CYGWIN_CHOST} \
     --enable-shared \
     --enable-static
 

npth/npth-1.2-msysize.patch

@@ -1,34 +0,0 @@
-diff -Naur npth-1.2-orig/build-aux/compile npth-1.2/build-aux/compile
---- npth-1.2-orig/build-aux/compile	2015-01-28 13:26:31.000000000 +0300
-+++ npth-1.2/build-aux/compile	2015-04-30 09:57:10.015800000 +0300
-@@ -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 npth-1.2-orig/build-aux/config.guess npth-1.2/build-aux/config.guess
---- npth-1.2-orig/build-aux/config.guess	2015-01-28 13:26:06.000000000 +0300
-+++ npth-1.2/build-aux/config.guess	2015-04-30 09:56:37.191400000 +0300
-@@ -867,6 +867,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 ;;