Changeset 123 for trunk/debbuild

Timestamp:

08/01/07 15:25:06 (17 years ago)

Author:

kdeugau

Message:

/trunk

Maybe-fix? macro expansion bug regarding %{optflags}. Try it and see
if it breaks anything...

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -1576 +1576 @@
     } # while()
 
+    # Misc expansions
+    $macrostring =~ s|%{_arch}|$hostarch|g;
+    $macrostring =~ s|%{optflags}|$optflags{$hostarch}|g;
+
 # should probably stick a "no runaway" flag in here...  Just In Case...
     # %define's
     while (my ($key) = ($macrostring =~ /%{([a-z0-9]+)}/i) ) {
+# hrm.  This needs thinking.
+#die "A horrible death!  \%{$key}, '$macrostring'\n" if !$specglobals{$key};
       $macrostring =~ s|%{$key}|$specglobals{$key}|g;
                 # wanna limit this to "... if $specglobals{$key}", but need more magic
@@ -1588 +1594 @@
       $macrostring =~ s|%{__([a-z0-9_-]+)}|$1|g;
     }
-
-    # Misc expansions
-    $macrostring =~ s|%{_arch}|$hostarch|g;
-    $macrostring =~ s|%{optflags}|$optflags{$hostarch}|g;
 
     # Perl @INC/...lib locations, and other related bits.