Skip to content

Commit 57421dd

Browse files
Support %bcond of rpm 4.17.1
build#971
1 parent 63b7ae2 commit 57421dd

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Build/Rpm.pm

+5
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ sub builtinmacro {
330330
$args[0] =~ s/ $//;
331331
return $args[0];
332332
}
333+
if ($macname eq 'bcond') {
334+
$macros->{"with_$args[0]"} = $args[1] if $args[1];
335+
return '';
336+
}
333337
if ($macname eq 'bcond_with') {
334338
$macros->{"with_$args[0]"} = 1 if exists $macros->{"_with_$args[0]"};
335339
return '';
@@ -404,6 +408,7 @@ my %builtin_macros = (
404408
'undefined' => \&builtinmacro,
405409
'with' => \&builtinmacro,
406410
'without' => \&builtinmacro,
411+
'bcond' => \&builtinmacro,
407412
'bcond_with' => \&builtinmacro,
408413
'bcond_without' => \&builtinmacro,
409414
'expr' => \&builtinmacro,

0 commit comments

Comments
 (0)