ignore commandline build options for dependency rebuilds

openpkg-tool/openpkg-build.pl

@@ -1468,7 +1468,7 @@ sub make_dep ($$$$$$$) {
         } elsif ($why = target_better($env, $target, $env->{installed})) {
             target_setstatus($target,'UPDATE',3);
             print "# rebuilding $target->{name} ($why)\n";
-        } elsif (!target_suitable($t, $env->{with})) {
+        } elsif ($target->{GOAL} && !target_suitable($t, $env->{with})) {
             target_setstatus($target,'MISMATCH',2);
             print "# rebuilding $target->{name} (parameter mismatch)\n";
         } else {
@@ -1817,12 +1817,13 @@ sub find_proxy ($$) {
 # then map the result to --define command line arguments
 # suitable for rpm
 #
-sub make_defines ($$$$) {
-    my($old, $new, $def, $c) = @_;
+sub make_defines ($$$$$) {
+    my($old, $new, $def, $c, $isgoal) = @_;
     my($with);
 
     $old = {} unless $old;
     $def = {} unless $def;
+    $new = {} unless $isgoal;
 
     #
     # override old parameters with new parameters
@@ -1880,7 +1881,9 @@ sub print_list1 ($$$@$) {
         if ($uncond || !-f $bpkg ||
             !target_suitable(binary_target($_, $bpkg),$with)) {
 
-            $opt = make_defines($_->{OPTIONS}, $with, $_->{DEFOPTS}, $c);
+            $opt = make_defines($_->{OPTIONS}, $with,
+                                $_->{DEFOPTS}, $c,
+                                $_->{GOAL});
 
             #
             # proxy packages are rebuilt from their maste

openpkg-tool/openpkg-tool.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Group:        Bootstrapping
 License:      GPL
-Version:      20030320
-Release:      20030320
+Version:      20030321
+Release:      20030321
 
 #   list of sources
 Source0:      openpkg.sh