SPECS: builder - allow bcondrc overwriting

sparky sparky at pld-linux.org
Wed Jun 21 20:05:30 CEST 2006


Author: sparky                       Date: Wed Jun 21 18:05:30 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- allow bcondrc overwriting

---- Files affected:
SPECS:
   builder (1.445 -> 1.446) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.445 SPECS/builder:1.446
--- SPECS/builder:1.445	Tue Jun  6 14:08:34 2006
+++ SPECS/builder	Wed Jun 21 20:05:25 2006
@@ -1265,9 +1265,13 @@
 					# use only flags which are in this package.
 					if [[ $bcond_avail = *${opt}* ]]; then
 						if [[ $flag = -* ]]; then
-							BCOND="$BCOND --without $opt"
+							if [[ $BCOND != *--with?${opt}* ]]; then
+								BCOND="$BCOND --without $opt"
+							fi
 						else
-							BCOND="$BCOND --with $opt"
+							if [[ $BCOND != *--without?${opt}* ]]; then
+								BCOND="$BCOND --with $opt"
+							fi
 						fi
 					fi
 				done
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.445&r2=1.446&f=u



More information about the pld-cvs-commit mailing list