[mingw-qt] Save a bit more diskspace to avoid koji build failures
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Dec 9 22:39:53 UTC 2012
commit 1da942c64c9ac4aa712f95831fee791d51ec96f7
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Dec 9 23:39:48 2012 +0100
Save a bit more diskspace to avoid koji build failures
mingw-qt.spec | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/mingw-qt.spec b/mingw-qt.spec
index 8c047fe..1450f94 100644
--- a/mingw-qt.spec
+++ b/mingw-qt.spec
@@ -372,7 +372,12 @@ make %{?_smp_mflags}
# Install the static libraries in a temporary prefix so we can merge everything together properly
mkdir $RPM_BUILD_ROOT/static
make install -C ../build_release_static_win32 INSTALL_ROOT=$RPM_BUILD_ROOT/static
+
+# Clean up everything in the static tree which we don't need to safe disk space
+rm -rf $RPM_BUILD_ROOT/static/%{mingw32_bindir}
+
make install -C ../build_release_static_win64 INSTALL_ROOT=$RPM_BUILD_ROOT/static
+rm -rf $RPM_BUILD_ROOT/static/%{mingw64_bindir}
# Drop the qtmain static library from the static tree as
# it's already part of the main tree
@@ -385,10 +390,6 @@ for FN in $RPM_BUILD_ROOT/static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT/static%{mi
mv $FN $FN_NEW
done
-# Clean up everything in the static tree which we don't need to safe disk space
-rm -rf $RPM_BUILD_ROOT/static/%{mingw32_bindir}
-rm -rf $RPM_BUILD_ROOT/static/%{mingw64_bindir}
-
# Install the shared libraries
make install -C ../build_debug_win32 INSTALL_ROOT=$RPM_BUILD_ROOT
make install -C ../build_release_win32 INSTALL_ROOT=$RPM_BUILD_ROOT
More information about the scm-commits
mailing list