From b9dfd3a81585f050aa36503b69d3abb740fc306e Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sat, 30 Sep 2023 14:16:11 +0000
Subject: [PATCH] hwloc: Fix build with clang17

This moves -mwindows option to LDFLAGS from CFLAGS and fixes the following compiler error.
clang: error: unsupported option '-mwindows' for target 'x86_64-w64-windows-gnu'
---
 .../0001-hwloc-makefile-fix-ldflags.patch           | 13 +++++++++++++
 mingw-w64-hwloc/PKGBUILD                            |  9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-hwloc/0001-hwloc-makefile-fix-ldflags.patch

diff --git a/mingw-w64-hwloc/0001-hwloc-makefile-fix-ldflags.patch b/mingw-w64-hwloc/0001-hwloc-makefile-fix-ldflags.patch
new file mode 100644
index 0000000000..a28b8387f5
--- /dev/null
+++ b/mingw-w64-hwloc/0001-hwloc-makefile-fix-ldflags.patch
@@ -0,0 +1,13 @@
+--- a/utils/lstopo/Makefile.am
++++ b/utils/lstopo/Makefile.am
+@@ -59,8 +59,9 @@
+ endif
+ lstopo_win_SOURCES = $(lstopo_SOURCES)
+ lstopo_win_CPPFLAGS = $(lstopo_CPPFLAGS)
+-lstopo_win_CFLAGS = $(lstopo_CFLAGS) -mwindows
++lstopo_win_CFLAGS = $(lstopo_CFLAGS)
+ lstopo_win_LDADD = $(lstopo_LDADD)
++lstopo_win_LDFLAGS = -mwindows
+ endif
+ 
+ man1_pages = lstopo-no-graphics.1
diff --git a/mingw-w64-hwloc/PKGBUILD b/mingw-w64-hwloc/PKGBUILD
index f00d763ef0..5f2b801988 100644
--- a/mingw-w64-hwloc/PKGBUILD
+++ b/mingw-w64-hwloc/PKGBUILD
@@ -20,13 +20,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cairo"
 optdepends=("${MINGW_PACKAGE_PREFIX}-cairo"
             "${MINGW_PACKAGE_PREFIX}-libxml2")
 options=('!docs')
-license=('BSD')
+license=('spdx:BSD-3-Clause')
 url='https://www.open-mpi.org/projects/hwloc/'
-source=(https://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${_realname}-${pkgver}.tar.bz2)
-sha256sums=('5c4062ce556f6d3451fc177ffb8673a2120f81df6835dea6a21a90fbdfff0dec')
+source=(https://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${_realname}-${pkgver}.tar.bz2
+        0001-hwloc-makefile-fix-ldflags.patch)
+sha256sums=('5c4062ce556f6d3451fc177ffb8673a2120f81df6835dea6a21a90fbdfff0dec'
+            '5030dd260fcc26e4a8f1a222b81276263fb1bbff1b8da761bffc434aa9500439')
 
 prepare() {
   cd ${_realname}-${pkgver}
+  patch -p1 -i "${srcdir}/0001-hwloc-makefile-fix-ldflags.patch"
   autoreconf -fiv
 }