Allow the '--buildtool-opt' option to be used multiple times to pass multiple options to the underlying build tool (openSUSE#930)

Author: dmach

build-recipe

@@ -25,6 +25,7 @@
 BUILDTYPE=
 KIWI_PARAMETERS=
 BUILD_SKIP_BUNDLE=
+BUILD_TOOL_OPTS=()
 RPM_BUILD_IN_PLACE=
 RPM_RECIPE_IN_SUBDIR=
 RPM_NOPREP=
@@ -70,7 +71,7 @@ recipe_parse_options() {
     case ${PARAM/#--/-} in
       -buildtool-opt)
 	needarg
-	BUILD_TOOL_OPT="$ARG"
+	BUILD_TOOL_OPTS[${#BUILD_TOOL_OPTS[@]}]=$ARG
 	shift
 	;;
       -stage)

build-recipe-spec

@@ -179,8 +179,10 @@ recipe_build_spec() {
 
     # XXX: move _srcdefattr to macro file?
     rpmbopts=("--define" "_srcdefattr (-,root,root)")
-    if test -n "$BUILD_TOOL_OPT" ; then
-	    rpmbopts[${#rpmbopts[@]}]="$BUILD_TOOL_OPT"
+    if test -n "$BUILD_TOOL_OPTS" ; then
+        for opt in ${BUILD_TOOL_OPTS[@]}; do
+	    rpmbopts[${#rpmbopts[@]}]=$opt
+        done
     fi
     if test "$DO_CHECKS" != true ; then
 	if chroot "$BUILD_ROOT" "$rpmbuild" --nocheck --help >/dev/null 2>&1; then