util-linux: build for cygwin

msys2 · Jan 31, 2025 · f2f9ec0 · f2f9ec0
1 parent 2e7d58d
commit f2f9ec0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 88 deletions.
diff --git a/util-linux/2.24.2-msysize.patch b/util-linux/2.24.2-msysize.patch
diff --git a/util-linux/PKGBUILD b/util-linux/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=("util-linux" "libutil-linux" "libutil-linux-devel")
 _pkgmajor=2.35
 pkgver=${_pkgmajor}.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Miscellaneous system utilities for Linux"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -25,8 +25,7 @@ source=(https://www.kernel.org/pub/linux/utils/$pkgname/v${_pkgmajor}/${pkgname}
         2.33.1-cygwin-ionice.patch
         2.33.1-cygwin-taskset.patch
         2.32.1-testsuite.patch
-        2.25.1-relocate-sbin-to-usr-bin.patch
-        2.24.2-msysize.patch)
+        2.25.1-relocate-sbin-to-usr-bin.patch)
 sha256sums=('21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a'
             '0d6c812fab3deb34842dfb4313ce626e389c0961fe863a653ee1799a16614200'
             '347ff26c7750ef586dd50c3ac0be0b86604f8c4a4f148a0fc4e49d9ec55e2198'
@@ -36,8 +35,7 @@ sha256sums=('21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a'
             'e8ee1a1577899d00c6e198cf81cd11af445eb6c906a602559a751c0f4878f248'
             'e355a7c05ad4abc5e6076e047e470b12104f1da1404313258470d404c7c26b38'
             'ea33be334f966df7b08b9d4d7b1f10df1c3f3cd08eade156d1f6969f913658d9'
-            'd6bfc7e34349a98c8d110f1e216bd16d6f1edf45c369cda8c6301fb994986d13'
-            '11563826de30d5e7e372e2901f3fd9d5b86539ae0c38c3d709c16b894b3034e5')
+            'd6bfc7e34349a98c8d110f1e216bd16d6f1edf45c369cda8c6301fb994986d13')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -50,7 +48,6 @@ prepare() {
   patch -p2 -i ${srcdir}/2.33.1-cygwin-ionice.patch
   patch -p2 -i ${srcdir}/2.33.1-cygwin-taskset.patch
   patch -p2 -i ${srcdir}/2.32.1-testsuite.patch
-  patch -p1 -i ${srcdir}/2.24.2-msysize.patch
   patch -p1 -i ${srcdir}/2.25.1-relocate-sbin-to-usr-bin.patch
   autoreconf -fi
 }
@@ -61,8 +58,10 @@ build() {
 
   CPPFLAGS+=" -D__USE_LINUX_IOCTL_DEFS"
 
+  export MSYSTEM=CYGWIN
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${pkgver}/configure \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --prefix=/usr \
     --bindir=/usr/bin \
     --sbindir=/usr/bin \