[packages/kBuild] add verbose bcond; do not call "clean" for normal build, only bootstrap

[glen]

commit e62575645b63d4e088cfee87b03e152a6b5ad456
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Nov 25 19:21:08 2012 +0200

    add verbose bcond; do not call "clean" for normal build, only bootstrap

 kBuild.spec | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/kBuild.spec b/kBuild.spec
index 295fb58..8d69c35 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_with	bootstrap		# build boostrap
+%bcond_without	verbose		# disable verbose build
 
 %define		svnrev 2577
 Summary:	A cross-platform build environment
@@ -65,22 +66,19 @@ EOF
 %{__sed} -i -e 's at _LDFLAGS\.%{kbuild_arch}*.*=@& %{rpmldflags}@g' Config.kmk
 
 %build
-%define bootstrap_mflags %{?_smp_mflags} \\\
-		CC="%{__cc}" \\\
-		TOOL_GCC3_CC="%{__cc}" \\\
-		CFLAGS="%{rpmcflags}"			\\\
-		KBUILD_VERBOSE=2				\\\
-		KBUILD_VERSION_PATCH=999
-
-%define mflags %{bootstrap_mflags}      \\\
-		NIX_INSTALL_DIR=%{_prefix}	  \\\
-		BUILD_TYPE=release			  \\\
-		MY_INST_MODE=0644			   \\\
+%define bootstrap_mflags %{?_smp_mflags} %{?with_verbose:KBUILD_VERBOSE=2} \\\
+		CC="%{__cc}" TOOL_GCC3_CC="%{__cc}" CFLAGS="%{rpmcflags}"
+
+%define mflags %{bootstrap_mflags} \\\
+		NIX_INSTALL_DIR=%{_prefix} \\\
+		BUILD_TYPE=release \\\
+		MY_INST_MODE=0644 \\\
 		MY_INST_BIN_MODE=0755
 
 ver=$(awk '/^KBUILD_VERSION =/{print $3}' Config.kmk)
 test "$ver" = %{version}
 
+%if %{with bootstrap}
 cd src/kmk
 %{__libtoolize}
 %{__aclocal} -I config
@@ -95,16 +93,17 @@ cd ../sed
 %{__automake}
 cd ../..
 
-%if %{with bootstrap}
 kBuild/env.sh --full \
 	%{__make} -f bootstrap.gmk %{bootstrap_mflags}
+
+kBuild/env.sh kmk clean
 %endif
 
-kBuild/env.sh kmk %{mflags} rebuild
+kBuild/env.sh kmk %{mflags} all \
+	PATH_INS=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export KBUILD_VERBOSE=2
 kBuild/env.sh kmk %{mflags} install \
 	PATH_INS=$RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kBuild.git/commitdiff/3ae532bd8487f33106373f75b655f3afc1e3f163