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

Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros

Browse Source 
Setting CMAKE_INSTALL_PREFIX is sufficient, lib relative to the CMAKE_INSTALL_PREFIX is default
This commit is contained in:
Sandro Mani 2022-05-11 11:42:42 +02:00
parent 7be5939330
commit 508578c74b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macros.mingw32
View File

@ -138,7 +138,6 @@
-DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW32_CMAKE_ARGS} \\\ ${MINGW32_CMAKE_ARGS} \\\
"$@" $__mingw32_topdir "$@" $__mingw32_topdir

1
macros.mingw64
View File

@ -138,7 +138,6 @@
-DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
-DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
${MINGW_CMAKE_ARGS} \\\ ${MINGW_CMAKE_ARGS} \\\
${MINGW64_CMAKE_ARGS} \\\ ${MINGW64_CMAKE_ARGS} \\\
"$@" $__mingw64_topdir "$@" $__mingw64_topdir

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: 137 Version: 138
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
* Wed May 11 2022 Sandro Mani <manisandro@gmail.com> - 138-1
- Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros
* Mon May 09 2022 Richard Hughes <richard@hughsie.com> 137-1 * Mon May 09 2022 Richard Hughes <richard@hughsie.com> 137-1
- Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building. - Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building.