From 7c3166374f2d60e71b97d3172ba510dfa8c8b0eb Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 6 Aug 2024 21:25:12 +0200 Subject: [PATCH] main/iscsi-scst: fix build with gcc 14 --- main/iscsi-scst/APKBUILD | 11 ++++++++--- main/iscsi-scst/gcc14.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 main/iscsi-scst/gcc14.patch diff --git a/main/iscsi-scst/APKBUILD b/main/iscsi-scst/APKBUILD index 42b52a5c051..d918ad5a4f0 100644 --- a/main/iscsi-scst/APKBUILD +++ b/main/iscsi-scst/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=iscsi-scst pkgver=2.2.1 -pkgrel=6 +pkgrel=7 pkgdesc="ISCSI target for SCST - userspace tools" url="https://scst.sourceforge.net/" arch="all" @@ -11,6 +11,7 @@ makedepends="linux-headers bash" subpackages="$pkgname-openrc" source="https://downloads.sourceforge.net/scst/iscsi-scst-$pkgver.tar.bz2 https://downloads.sourceforge.net/scst/scst-$pkgver.tar.bz2 + gcc14.patch $pkgname.initd $pkgname.confd scst.conf @@ -18,6 +19,7 @@ source="https://downloads.sourceforge.net/scst/iscsi-scst-$pkgver.tar.bz2 options="!check" prepare() { + default_prepare cp Makefile_user_space_only Makefile } @@ -34,8 +36,11 @@ package() { install -D -m 644 "$srcdir"/scst.conf "$pkgdir"/etc/scst.conf } -sha512sums="3be7013a75c8f8145e70498b5e8aa6ade419d947e54350e856f4af7a6338741cec9b0f79e4e747b7187274b0c4de2d5c7d28f24a0a7d1549ab712da1068d6b39 iscsi-scst-2.2.1.tar.bz2 +sha512sums=" +3be7013a75c8f8145e70498b5e8aa6ade419d947e54350e856f4af7a6338741cec9b0f79e4e747b7187274b0c4de2d5c7d28f24a0a7d1549ab712da1068d6b39 iscsi-scst-2.2.1.tar.bz2 6e1b3e1ab92de2d46715a2db546419ff2d122c386756fda8000413f9b0416088947acc9441a6e18b74fe32f491c03a6fea325b70a9ae6a6888039dcffe093c3d scst-2.2.1.tar.bz2 +b29aab25520e4270304d3b862fef01883b8aaec9789f60c77d0511257d1a065ed7e08880ee9dacc9d63eceff1851309911be4ff2d6a07cb73a167ebba08e1366 gcc14.patch b96b32d8fe15c2b824bb4d28300420c169556b5babc75bad4bc48c3c1cd453397c24f3058b54ec2a52fbd6f925124a88440b8c8839cc1147239a29a0e76081a4 iscsi-scst.initd 2cb3907fbe9e0685bb7fc7f7108a6834f04a0a1e46f9e2d440cfcc627678f02a8c91fc61cc0ac06b4b014f76bc46ab42c611ba3b76db4ae37688011a9684cce6 iscsi-scst.confd -bde98028689e075c07ae8b94ac94a76ca53142cd57f7dca6c209f46489ea66da4e50e56eab5405821008a5b4a72174faa3f45f39ec8844dfe0f18f8cd891195f scst.conf" +bde98028689e075c07ae8b94ac94a76ca53142cd57f7dca6c209f46489ea66da4e50e56eab5405821008a5b4a72174faa3f45f39ec8844dfe0f18f8cd891195f scst.conf +" diff --git a/main/iscsi-scst/gcc14.patch b/main/iscsi-scst/gcc14.patch new file mode 100644 index 00000000000..8c07dc33bea --- /dev/null +++ b/main/iscsi-scst/gcc14.patch @@ -0,0 +1,12 @@ +diff --git a/usr/message.c b/usr/message.c +index 86e2aef..16d5eb4 100644 +--- a/usr/message.c ++++ b/usr/message.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + + #include