rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert unsetting _PREFIX

Browse Source
This commit is contained in:
Sandro Mani 2022-07-30 08:48:33 +02:00
parent 82f4189ad6
commit 28d3d2b73d
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macros.mingw32
View File

@ -62,6 +62,7 @@
x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
declare -x $x="$i" ; export $x; \ declare -x $x="$i" ; export $x; \
done; \ done; \
unset _PREFIX; \
CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \ CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \
CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \ CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \
CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \ CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \

1
macros.mingw64
View File

@ -62,6 +62,7 @@
x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
declare -x $x="$i" ; export $x; \ declare -x $x="$i" ; export $x; \
done; \ done; \
unset _PREFIX; \
CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \ CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \
CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \ CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \
CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \ CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \

1
macros.ucrt64
View File

@ -61,6 +61,7 @@
x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \
declare -x $x="$i" ; export $x; \ declare -x $x="$i" ; export $x; \
done; \ done; \
unset _PREFIX; \
CC="${UCRT64_CC:-%ucrt64_cc}"; export CC; \ CC="${UCRT64_CC:-%ucrt64_cc}"; export CC; \
CFLAGS="${UCRT64_CFLAGS-%ucrt64_cflags}"; export CFLAGS; \ CFLAGS="${UCRT64_CFLAGS-%ucrt64_cflags}"; export CFLAGS; \
CPPFLAGS="${UCRT64_CPPFLAGS-%ucrt64_cppflags}"; export CPPFLAGS; \ CPPFLAGS="${UCRT64_CPPFLAGS-%ucrt64_cppflags}"; export CPPFLAGS; \

5
mingw-filesystem.spec
View File

@ -6,7 +6,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem Name: mingw-filesystem
Version: 140 Version: 141
Release: 1%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment 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 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
%changelog %changelog
* Sat Jul 30 2022 Sandro Mani <manisandro@gmail.com> - 141-1
- Revert unsetting _PREFIX
* Fri Jul 29 2022 Sandro Mani <manisandro@gmail.com> - 140-1 * Fri Jul 29 2022 Sandro Mani <manisandro@gmail.com> - 140-1
- Don't unset _PREFIX in mingw-env macro, it leads to ${_PREFIX} - Don't unset _PREFIX in mingw-env macro, it leads to ${_PREFIX}
being empty when evaluated the lines above being empty when evaluated the lines above