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

Make sure the %mingw_cmake and %mingw_cmake_kde4 macros respect the environment variable MINGW_BUILDDIR_SUFFIX

Browse Source
This commit is contained in:
Erik van Pienbroek 2012-08-13 15:17:25 +02:00
parent f5f39d387d
commit 7b07576344
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
macros.mingw
View File

@ -61,40 +61,40 @@ make -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" \
} \ } \
run_mingw_make run_mingw_make
%mingw_cmake \ %mingw_cmake \
run_mingw_cmake() \ run_mingw_cmake() \
{ \ { \
%if 0%{?mingw_build_win32} == 1 \ %if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$suffix \ mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$suffix \ pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_cmake "$@"} \ %{?mingw32_cmake "$@"} \
popd \ popd \
%endif \ %endif \
%if 0%{?mingw_build_win64} == 1 \ %if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$suffix \ mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$suffix \ pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_cmake "$@"} \ %{?mingw64_cmake "$@"} \
popd \ popd \
%endif \ %endif \
} \ } \
run_mingw_cmake run_mingw_cmake
%mingw_cmake_kde4 \ %mingw_cmake_kde4 \
run_mingw_cmake_kde4() \ run_mingw_cmake_kde4() \
{ \ { \
%if 0%{?mingw_build_win32} == 1 \ %if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$suffix \ mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$suffix \ pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_cmake_kde4 "$@"} \ %{?mingw32_cmake_kde4 "$@"} \
popd \ popd \
%endif \ %endif \
%if 0%{?mingw_build_win64} == 1 \ %if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$suffix \ mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$suffix \ pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_cmake_kde4 "$@"} \ %{?mingw64_cmake_kde4 "$@"} \
popd \ popd \
%endif \ %endif \
} \ } \
run_mingw_cmake_kde4 run_mingw_cmake_kde4
# Deprecated: # Deprecated:

8
mingw-filesystem.spec
View File

@ -2,7 +2,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 95 Version: 95
Release: 12%{?dist} Release: 13%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -246,7 +246,11 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> * Tue Jul 24 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-13
- Make sure the %%mingw_cmake and %%mingw_cmake_kde4 macros respect the
environment variable MINGW_BUILDDIR_SUFFIX
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 95-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed Jun 13 2012 Kalev Lember <kalevlember@gmail.com> - 95-11 * Wed Jun 13 2012 Kalev Lember <kalevlember@gmail.com> - 95-11