From: Michael Schröder <mls@suse.de>
Date: Fri, 28 Mar 2008 14:01:09 +0000 (+0000)
Subject: - define %nil macro
X-Git-Tag: obs_2.0~405
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b7881e0b5561862274361f6d14ff9ab7b2a8baf;p=platform%2Fupstream%2Fbuild.git

- define %nil macro
- work around some multiline macro problem
---

diff --git a/Build.pm b/Build.pm
index f1f23b9..09d6162 100644
--- a/Build.pm
+++ b/Build.pm
@@ -24,6 +24,7 @@ sub import {
 
 
 my $std_macros = q{
+%define nil
 %define ix86 i386 i486 i586 i686 athlon
 %define arm armv4l armv4b armv5l armv5b armv5tel armv5teb
 %define arml armv4l armv5l armv5tel
@@ -216,7 +217,13 @@ sub read_config {
   # add rawmacros to our macro list
   if ($config->{'rawmacros'} ne '') {
     for my $rm (split("\n", $config->{'rawmacros'})) {
-      if ((@macros && $macros[-1] =~ /\\$/) || $rm !~ /^%/) {
+      if (@macros && $macros[-1] =~ /\\$/) {
+	if ($rm =~ /\\$/) {
+	  push @macros, '...\\';
+	} else {
+	  push @macros, '...';
+	}
+      } elsif ($rm !~ /^%/) {
 	push @macros, $rm;
       } else {
 	push @macros, "%define ".substr($rm, 1);
@@ -433,6 +440,8 @@ sub addproviders {
   for my $rp (@rp) {
     for my $pp (@{$provides->{$rp} || []}) {
       if ($pp eq $rn) {
+	# debian: unversioned provides do not match
+	next if $config->{'type'} ne 'spec';
 	push @p, $rp;
 	last;
       }