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

Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros

Browse Source
This commit is contained in:
Sandro Mani 2022-12-28 19:27:22 +01:00
parent 846156c1bd
commit feac8b0097
4 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
macros.mingw
View File

@ -100,29 +100,6 @@ popd \
} \ } \
run_mingw_cmake run_mingw_cmake
%mingw_cmake_kde4 \
run_mingw_cmake_kde4() \
{ \
%if 0%{?mingw_build_win32} == 1 \
mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_cmake_kde4 "$@"} \
popd \
%endif \
%if 0%{?mingw_build_win64} == 1 \
mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_cmake_kde4 "$@"} \
popd \
%endif \
%if 0%{?mingw_build_ucrt64} == 1 \
mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX \
pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX \
%{?ucrt64_cmake_kde4 "$@"} \
popd \
%endif \
} \
run_mingw_cmake_kde4
%mingw_qmake_qt5 \ %mingw_qmake_qt5 \
run_mingw_qmake_qt5() \ run_mingw_qmake_qt5() \
@ -148,6 +125,32 @@ popd \
} \ } \
run_mingw_qmake_qt5 run_mingw_qmake_qt5
%mingw_qmake_qt6 \
run_mingw_qmake_qt6() \
{ \
%if 0%{?mingw_build_win32} == 1 \
mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_qmake_qt6} "$@" \
popd \
%endif \
%if 0%{?mingw_build_win64} == 1 \
mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_qmake_qt6} "$@" \
popd \
%endif \
%if 0%{?mingw_build_ucrt64} == 1 \
mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX \
pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX \
%{?ucrt64_qmake_qt6} "$@" \
popd \
%endif \
} \
run_mingw_qmake_qt6
%mingw_meson \ %mingw_meson \
run_mingw_meson() \ run_mingw_meson() \
{ \ { \

6
macros.mingw32
View File

@ -146,12 +146,10 @@
MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir} ${MINGW32_CMAKE_ARGS}" \ MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir} ${MINGW32_CMAKE_ARGS}" \
%mingw32_cmake_generic %mingw32_cmake_generic
%mingw32_cmake_kde4 \
MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4 ${MINGW32_CMAKE_ARGS}" \
%mingw32_cmake_generic
%mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
%mingw32_qmake_qt6 /usr/bin/%{mingw32_target}-qmake-qt6
%mingw32_meson %{mingw32_env} ; \ %mingw32_meson %{mingw32_env} ; \
unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\ CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\

6
macros.mingw64
View File

@ -146,12 +146,10 @@
MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir} ${MINGW64_CMAKE_ARGS}" \ MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir} ${MINGW64_CMAKE_ARGS}" \
%mingw64_cmake_generic %mingw64_cmake_generic
%mingw64_cmake_kde4 \
MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4 ${MINGW64_CMAKE_ARGS}" \
%mingw64_cmake_generic
%mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
%mingw64_qmake_qt6 /usr/bin/%{mingw64_target}-qmake-qt6
%mingw64_meson %{mingw64_env} ; \ %mingw64_meson %{mingw64_env} ; \
unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\ unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\ CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\

5
mingw-filesystem.spec
View File

@ -9,7 +9,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: 143 Version: 144
Release: 1%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
@ -376,6 +376,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
* Fri Dec 23 2022 Sandro Mani <manisandro@gmail.com> - 144-1
- Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros
* Fri Dec 09 2022 Sandro Mani <manisandro@gmail.com> - 143-1 * Fri Dec 09 2022 Sandro Mani <manisandro@gmail.com> - 143-1
- Prevent mingw-find-lang.sh from clobbering previous find-lang results - Prevent mingw-find-lang.sh from clobbering previous find-lang results