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

Fix ucrt64 toolchain filenames.

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-02-24 17:53:59 +04:00
parent a4f0ba0de5
commit b9ffd1b6a5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.ucrt64
View File

@ -130,7 +130,7 @@
UCRT64_CMAKE_ARGS="${UCRT64_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \ UCRT64_CMAKE_ARGS="${UCRT64_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \
fi \ fi \
PATH=%{_prefix}/%{ucrt64_target}/bin:$PATH %__cmake \\\ PATH=%{_prefix}/%{ucrt64_target}/bin:$PATH %__cmake \\\
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32ucrt64.cmake \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-ucrt64.cmake \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\
-DSYSCONF_INSTALL_DIR:PATH=%{ucrt64_sysconfdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{ucrt64_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{ucrt64_datadir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{ucrt64_datadir} \\\
@ -159,7 +159,7 @@
elif test -f ../meson.build; then __ucrt64_topdir=..; \\\ elif test -f ../meson.build; then __ucrt64_topdir=..; \\\
else __ucrt64_topdir=""; fi; \\\ else __ucrt64_topdir=""; fi; \\\
%__meson \\\ %__meson \\\
--cross-file /usr/share/mingw/toolchain-mingw32ucrt64.meson \\\ --cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\
--default-library shared \\\ --default-library shared \\\
--prefix %{ucrt64_prefix} \\\ --prefix %{ucrt64_prefix} \\\
--bindir %{ucrt64_bindir} \\\ --bindir %{ucrt64_bindir} \\\

5
mingw-filesystem.spec
View File

@ -7,7 +7,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 133 Version: 133
Release: 1%{?dist} Release: 2%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
License: GPLv2+ License: GPLv2+
@ -439,6 +439,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
* Thu Feb 24 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-2
- Fix ucrt64 toolchain filenames.
* Tue Feb 22 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-1 * Tue Feb 22 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-1
- Add ucrt64 target. Related to rhbz#2055254. - Add ucrt64 target. Related to rhbz#2055254.