From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 18 Feb 2016 23:22:28 +0000 (+0100)
Subject: src/yasm-wrapper: ignore parameters starting with ggc-min
X-Git-Tag: v10.0.4~6^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7eba2aa3d4605851ec2d1cf9fa04ea6dc1d5ebd;p=ceph.git

src/yasm-wrapper: ignore parameters starting with ggc-min

When the "with lowmem_builder" bcond is active, the string "--param
ggc-min-expand=20 --param ggc-min-heapsize=32768" is added to
RPM_OPT_FLAGS. In the course of the build, these parameters get passed on
to yasm-wrapper, making it unhappy.

http://tracker.ceph.com/issues/14811 Fixes: #14811

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/yasm-wrapper b/src/yasm-wrapper
index 36951920b042..9500d2faa1d8 100755
--- a/src/yasm-wrapper
+++ b/src/yasm-wrapper
@@ -12,7 +12,7 @@ while [ -n "$*" ]; do
 	    new="$new -f $1"
 	    shift
 	    ;;
-	-g* | -f* | -W* | -MD | -MP | -fPIC | -c | -D* | --param* | -O* | -m* | -pipe )
+	-g* | -f* | -W* | -MD | -MP | -fPIC | -c | -D* | --param* | -O* | -m* | -pipe | ggc-min* )
 	    shift
 	    ;;
 	-I )
@@ -41,4 +41,4 @@ yasm $new
 
 [ -n "$touch" ] && touch $touch
 
-true
\ No newline at end of file
+true