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

Tweak cmake macro to allow overriding INCLUDE_INSTALL_DIR, fix double passed via mingw-scripts

Browse Source
This commit is contained in:
Sandro Mani 2021-09-02 00:36:00 +02:00
parent f6cc2b6d75
commit 0a51e8a6f9
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
macros.mingw32
View File

@ -80,7 +80,7 @@
done; \ done; \
unset x i unset x i
%mingw32_pkg_config %{mingw32_target}-pkg-config %mingw32_pkg_config %{mingw32_target}-pkg-config "$@"
%mingw32_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d %mingw32_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d
%mingw32_configure %{mingw32_env} ; \ %mingw32_configure %{mingw32_env} ; \
@ -103,7 +103,7 @@
--mandir=%{mingw32_mandir} \\\ --mandir=%{mingw32_mandir} \\\
--infodir=%{mingw32_infodir} \\\ --infodir=%{mingw32_infodir} \\\
${MINGW_CONFIGURE_ARGS} \\\ ${MINGW_CONFIGURE_ARGS} \\\
${MINGW32_CONFIGURE_ARGS} ${MINGW32_CONFIGURE_ARGS} "$@"
%mingw32_make %{mingw32_env} ; \ %mingw32_make %{mingw32_env} ; \
make \\\ make \\\
@ -119,7 +119,7 @@
localstatedir=%{mingw32_localstatedir} \\\ localstatedir=%{mingw32_localstatedir} \\\
sharedstatedir=%{mingw32_sharedstatedir} \\\ sharedstatedir=%{mingw32_sharedstatedir} \\\
mandir=%{mingw32_mandir} \\\ mandir=%{mingw32_mandir} \\\
infodir=%{mingw32_infodir} infodir=%{mingw32_infodir} "$@"
%mingw32_cmake_generic %{mingw32_env} ; \ %mingw32_cmake_generic %{mingw32_env} ; \
PKG_CONFIG_LIBDIR="%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ PKG_CONFIG_LIBDIR="%{mingw32_libdir}/pkgconfig:%{mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
@ -141,11 +141,11 @@
"$@" $__mingw32_topdir "$@" $__mingw32_topdir
%mingw32_cmake \ %mingw32_cmake \
MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \ MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir} ${MINGW32_CMAKE_ARGS}" \
%mingw32_cmake_generic %mingw32_cmake_generic
%mingw32_cmake_kde4 \ %mingw32_cmake_kde4 \
MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4" \ MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4 ${MINGW32_CMAKE_ARGS}" \
%mingw32_cmake_generic %mingw32_cmake_generic
%mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4 %mingw32_qmake_qt4 /usr/bin/mingw32-qmake-qt4

10
macros.mingw64
View File

@ -80,7 +80,7 @@
done; \ done; \
unset x i unset x i
%mingw64_pkg_config %{mingw64_target}-pkg-config %mingw64_pkg_config %{mingw64_target}-pkg-config "$@"
%mingw64_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d %mingw64_pkgconfig_personalitydir %{mingw32_datadir}/pkgconfig/personality.d
%mingw64_configure %{mingw64_env} ; \ %mingw64_configure %{mingw64_env} ; \
@ -103,7 +103,7 @@
--mandir=%{mingw64_mandir} \\\ --mandir=%{mingw64_mandir} \\\
--infodir=%{mingw64_infodir} \\\ --infodir=%{mingw64_infodir} \\\
${MINGW_CONFIGURE_ARGS} \\\ ${MINGW_CONFIGURE_ARGS} \\\
${MINGW64_CONFIGURE_ARGS} ${MINGW64_CONFIGURE_ARGS} "$@"
%mingw64_make %{mingw64_env} ; \ %mingw64_make %{mingw64_env} ; \
make \\\ make \\\
@ -119,7 +119,7 @@
localstatedir=%{mingw64_localstatedir} \\\ localstatedir=%{mingw64_localstatedir} \\\
sharedstatedir=%{mingw64_sharedstatedir} \\\ sharedstatedir=%{mingw64_sharedstatedir} \\\
mandir=%{mingw64_mandir} \\\ mandir=%{mingw64_mandir} \\\
infodir=%{mingw64_infodir} infodir=%{mingw64_infodir} "$@"
%mingw64_cmake_generic %{mingw64_env} ; \ %mingw64_cmake_generic %{mingw64_env} ; \
PKG_CONFIG_LIBDIR="%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ PKG_CONFIG_LIBDIR="%{mingw64_libdir}/pkgconfig:%{mingw64_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \
@ -141,11 +141,11 @@
"$@" $__mingw64_topdir "$@" $__mingw64_topdir
%mingw64_cmake \ %mingw64_cmake \
MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \ MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir} ${MINGW64_CMAKE_ARGS}" \
%mingw64_cmake_generic %mingw64_cmake_generic
%mingw64_cmake_kde4 \ %mingw64_cmake_kde4 \
MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4" \ MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4 ${MINGW64_CMAKE_ARGS}" \
%mingw64_cmake_generic %mingw64_cmake_generic
%mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4 %mingw64_qmake_qt4 /usr/bin/mingw64-qmake-qt4

6
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: 121 Version: 122
Release: 1%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
@ -351,6 +351,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
%changelog %changelog
* Thu Sep 02 2021 Sandro Mani <manisandro@gmail.com> - 122-1
- Allow overriding CMake INCLUDE_INSTALL_DIR in MINGWXX_CMAKE_ARGS
- Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain $@
* Sun Aug 29 2021 Sandro Mani <manisandro@gmail.com> - 121-1 * Sun Aug 29 2021 Sandro Mani <manisandro@gmail.com> - 121-1
- Drop use of deprecated external dependency generator - Drop use of deprecated external dependency generator
- Fix file listed twice - Fix file listed twice