[mingw-filesystem] Define mingw_build_win32/win64 in system macros
Kalev Lember
kalev at fedoraproject.org
Sat Mar 17 14:46:52 UTC 2012
commit 9dad08a5b6b90848f71cad9264af1dba033ee907
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat Mar 17 16:25:42 2012 +0200
Define mingw_build_win32/win64 in system macros
So far each individual spec file has had to define mingw_build_win32
and/or mingw_build_win64 on top of each spec file:
%global mingw_build_win32 1
%global mingw_build_win64 1
This commit changes it so that the default is now defined in system-wide
macros and each individual package doesn't have to clutter their spec
files with these two lines. The default is to build both 32 bit and 64
bit packages; if spec files need to opt out, they can just define either
mingw_build_win32 or mingw_build_win64 to 0.
macros.mingw | 52 +++++++++++++++++++++++++++++++-----------------
mingw-filesystem.spec | 6 ++++-
2 files changed, 38 insertions(+), 20 deletions(-)
---
diff --git a/macros.mingw b/macros.mingw
index bd8c96f..d741301 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -1,6 +1,8 @@
# RPM macros for the Fedora MinGW Cross Compiler collection
%mingw_build_targets mingw32 mingw64
+%mingw_build_win32 1
+%mingw_build_win64 1
%mingw_strip mingw-strip
%mingw_objdump mingw-objdump
@@ -14,9 +16,13 @@
%mingw_debug_install_post %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets}
-%mingw_debug_package \
-%{?mingw_build_win32: %{?mingw32_debug_package}} \
-%{?mingw_build_win64: %{?mingw64_debug_package}} \
+%mingw_debug_package \
+%if 0%{?mingw_build_win32} == 1 \
+%{?mingw32_debug_package} \
+%endif \
+%if 0%{?mingw_build_win64} == 1 \
+%{?mingw64_debug_package} \
+%endif \
%{nil}
%mingw_package_header \
@@ -28,58 +34,66 @@
%mingw_configure \
run_mingw_configure() \
{ \
-%{?mingw_build_win32: \
+%if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_configure} $@ \
-popd } \
-%{?mingw_build_win64: \
+popd \
+%endif \
+%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_configure} $@ \
-popd } \
+popd \
+%endif \
} \
run_mingw_configure
%mingw_make \
run_mingw_make() \
{ \
-%{?mingw_build_win32: \
-make -C build_win32$MINGW_BUILDDIR_SUFFIX $@} \
-%{?mingw_build_win64: \
-make -C build_win64$MINGW_BUILDDIR_SUFFIX $@} \
+%if 0%{?mingw_build_win32} == 1 \
+make -C build_win32$MINGW_BUILDDIR_SUFFIX $@ \
+%endif \
+%if 0%{?mingw_build_win64} == 1 \
+make -C build_win64$MINGW_BUILDDIR_SUFFIX $@ \
+%endif \
} \
run_mingw_make
%mingw_cmake \
run_mingw_cmake() \
{ \
-%{?mingw_build_win32: \
+%if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$suffix \
pushd build_win32$suffix \
%{?mingw32_cmake $@} \
-popd } \
-%{?mingw_build_win64: \
+popd \
+%endif \
+%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$suffix \
pushd build_win64$suffix \
%{?mingw64_cmake $@} \
-popd } \
+popd \
+%endif \
} \
run_mingw_cmake
%mingw_cmake_kde4 \
run_mingw_cmake_kde4() \
{ \
-%{?mingw_build_win32: \
+%if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$suffix \
pushd build_win32$suffix \
%{?mingw32_cmake_kde4 $@} \
-popd } \
-%{?mingw_build_win64: \
+popd \
+%endif \
+%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$suffix \
pushd build_win64$suffix \
%{?mingw64_cmake_kde4 $@} \
-popd } \
+popd \
+%endif \
} \
run_mingw_cmake_kde4
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 2620bd6..51e73b7 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
Name: mingw-filesystem
Version: 95
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries
@@ -250,6 +250,10 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog
+* Sat Mar 17 2012 Kalev Lember <kalevlember at gmail.com> - 95-7
+- Define mingw_build_win32/win64 in system macros, so that each
+ individual package wouldn't have to
+
* Fri Mar 16 2012 Kalev Lember <kalevlember at gmail.com> - 95-6
- Fix warnings during debuginfo generation
More information about the scm-commits
mailing list