From 28d3d2b73df3e553c41d995c1e3b0355face1d2e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jul 30 2022 06:48:33 +0000 Subject: Revert unsetting _PREFIX --- diff --git a/macros.mingw32 b/macros.mingw32 index e2ecb4e..6caf0a2 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -62,6 +62,7 @@ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \ declare -x $x="$i" ; export $x; \ done; \ + unset _PREFIX; \ CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \ CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \ CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \ diff --git a/macros.mingw64 b/macros.mingw64 index 9af606e..bf28141 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -62,6 +62,7 @@ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \ declare -x $x="$i" ; export $x; \ done; \ + unset _PREFIX; \ CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \ CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \ CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \ diff --git a/macros.ucrt64 b/macros.ucrt64 index 314dc3d..acbde9e 100644 --- a/macros.ucrt64 +++ b/macros.ucrt64 @@ -61,6 +61,7 @@ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \ declare -x $x="$i" ; export $x; \ done; \ + unset _PREFIX; \ CC="${UCRT64_CC:-%ucrt64_cc}"; export CC; \ CFLAGS="${UCRT64_CFLAGS-%ucrt64_cflags}"; export CFLAGS; \ CPPFLAGS="${UCRT64_CPPFLAGS-%ucrt64_cppflags}"; export CPPFLAGS; \ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 9f8f271..732c90f 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,7 +6,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 140 +Version: 141 Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Sat Jul 30 2022 Sandro Mani - 141-1 +- Revert unsetting _PREFIX + * Fri Jul 29 2022 Sandro Mani - 140-1 - Don't unset _PREFIX in mingw-env macro, it leads to ${_PREFIX} being empty when evaluated the lines above