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

Define mingw_build_win32/win64 in system macros

Browse Source 
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.
This commit is contained in:
Kalev Lember 2012-03-17 16:25:42 +02:00
parent 3fc8958472
commit 9dad08a5b6
2 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
macros.mingw
View File

@ -1,6 +1,8 @@
# RPM macros for the Fedora MinGW Cross Compiler collection # RPM macros for the Fedora MinGW Cross Compiler collection
%mingw_build_targets mingw32 mingw64 %mingw_build_targets mingw32 mingw64
%mingw_build_win32 1
%mingw_build_win64 1
%mingw_strip mingw-strip %mingw_strip mingw-strip
%mingw_objdump mingw-objdump %mingw_objdump mingw-objdump
@ -15,8 +17,12 @@
%mingw_debug_install_post %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets} %mingw_debug_install_post %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets}
%mingw_debug_package \ %mingw_debug_package \
%{?mingw_build_win32: %{?mingw32_debug_package}} \ %if 0%{?mingw_build_win32} == 1 \
%{?mingw_build_win64: %{?mingw64_debug_package}} \ %{?mingw32_debug_package} \
%endif \
%if 0%{?mingw_build_win64} == 1 \
%{?mingw64_debug_package} \
%endif \
%{nil} %{nil}
%mingw_package_header \ %mingw_package_header \
@ -28,58 +34,66 @@
%mingw_configure \ %mingw_configure \
run_mingw_configure() \ run_mingw_configure() \
{ \ { \
%{?mingw_build_win32: \ %if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$MINGW_BUILDDIR_SUFFIX \ mkdir build_win32$MINGW_BUILDDIR_SUFFIX \
pushd build_win32$MINGW_BUILDDIR_SUFFIX \ pushd build_win32$MINGW_BUILDDIR_SUFFIX \
%{?mingw32_configure} $@ \ %{?mingw32_configure} $@ \
popd } \ popd \
%{?mingw_build_win64: \ %endif \
%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$MINGW_BUILDDIR_SUFFIX \ mkdir build_win64$MINGW_BUILDDIR_SUFFIX \
pushd build_win64$MINGW_BUILDDIR_SUFFIX \ pushd build_win64$MINGW_BUILDDIR_SUFFIX \
%{?mingw64_configure} $@ \ %{?mingw64_configure} $@ \
popd } \ popd \
%endif \
} \ } \
run_mingw_configure run_mingw_configure
%mingw_make \ %mingw_make \
run_mingw_make() \ run_mingw_make() \
{ \ { \
%{?mingw_build_win32: \ %if 0%{?mingw_build_win32} == 1 \
make -C build_win32$MINGW_BUILDDIR_SUFFIX $@} \ make -C build_win32$MINGW_BUILDDIR_SUFFIX $@ \
%{?mingw_build_win64: \ %endif \
make -C build_win64$MINGW_BUILDDIR_SUFFIX $@} \ %if 0%{?mingw_build_win64} == 1 \
make -C build_win64$MINGW_BUILDDIR_SUFFIX $@ \
%endif \
} \ } \
run_mingw_make run_mingw_make
%mingw_cmake \ %mingw_cmake \
run_mingw_cmake() \ run_mingw_cmake() \
{ \ { \
%{?mingw_build_win32: \ %if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$suffix \ mkdir build_win32$suffix \
pushd build_win32$suffix \ pushd build_win32$suffix \
%{?mingw32_cmake $@} \ %{?mingw32_cmake $@} \
popd } \ popd \
%{?mingw_build_win64: \ %endif \
%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$suffix \ mkdir build_win64$suffix \
pushd build_win64$suffix \ pushd build_win64$suffix \
%{?mingw64_cmake $@} \ %{?mingw64_cmake $@} \
popd } \ popd \
%endif \
} \ } \
run_mingw_cmake run_mingw_cmake
%mingw_cmake_kde4 \ %mingw_cmake_kde4 \
run_mingw_cmake_kde4() \ run_mingw_cmake_kde4() \
{ \ { \
%{?mingw_build_win32: \ %if 0%{?mingw_build_win32} == 1 \
mkdir build_win32$suffix \ mkdir build_win32$suffix \
pushd build_win32$suffix \ pushd build_win32$suffix \
%{?mingw32_cmake_kde4 $@} \ %{?mingw32_cmake_kde4 $@} \
popd } \ popd \
%{?mingw_build_win64: \ %endif \
%if 0%{?mingw_build_win64} == 1 \
mkdir build_win64$suffix \ mkdir build_win64$suffix \
pushd build_win64$suffix \ pushd build_win64$suffix \
%{?mingw64_cmake_kde4 $@} \ %{?mingw64_cmake_kde4 $@} \
popd } \ popd \
%endif \
} \ } \
run_mingw_cmake_kde4 run_mingw_cmake_kde4

6
mingw-filesystem.spec
View File

@ -2,7 +2,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 95 Version: 95
Release: 6%{?dist} Release: 7%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -250,6 +250,10 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
%changelog %changelog
* Sat Mar 17 2012 Kalev Lember <kalevlember@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@gmail.com> - 95-6 * Fri Mar 16 2012 Kalev Lember <kalevlember@gmail.com> - 95-6
- Fix warnings during debuginfo generation - Fix warnings during debuginfo generation