OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 21-Mar-2003 10:45:07 Branch: HEAD Handle: 2003032109450005 Modified files: openpkg-src/openpkg-tool openpkg-build.pl openpkg-tool.spec openpkg-web news.txt Log: ignore commandline build options for dependency rebuilds Summary: Revision Changes Path 1.64 +7 -4 openpkg-src/openpkg-tool/openpkg-build.pl 1.46 +2 -2 openpkg-src/openpkg-tool/openpkg-tool.spec 1.3754 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-build.pl ============================================================================ $ cvs diff -u -r1.63 -r1.64 openpkg-build.pl --- openpkg-src/openpkg-tool/openpkg-build.pl 20 Mar 2003 15:33:54 -0000 1.63 +++ openpkg-src/openpkg-tool/openpkg-build.pl 21 Mar 2003 09:45:04 -0000 1.64 @@ -1468,7 +1468,7 @@ } 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 @@ # 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 @@ 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 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg-tool/openpkg-tool.spec ============================================================================ $ cvs diff -u -r1.45 -r1.46 openpkg-tool.spec --- openpkg-src/openpkg-tool/openpkg-tool.spec 20 Mar 2003 15:33:54 -0000 1.45 +++ openpkg-src/openpkg-tool/openpkg-tool.spec 21 Mar 2003 09:45:05 -0000 1.46 @@ -32,8 +32,8 @@ Distribution: OpenPKG [PLUS] Group: Bootstrapping License: GPL -Version: 20030320 -Release: 20030320 +Version: 20030321 +Release: 20030321 # list of sources Source0: openpkg.sh @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.3753 -r1.3754 news.txt --- openpkg-web/news.txt 21 Mar 2003 09:44:26 -0000 1.3753 +++ openpkg-web/news.txt 21 Mar 2003 09:45:00 -0000 1.3754 @@ -1,3 +1,4 @@ +21-Mar-2003: Upgraded package: P<openpkg-tool-20030321-20030321> 21-Mar-2003: Upgraded package: P<inn-2.3.5-20030321> 21-Mar-2003: Upgraded package: P<openldap-2.1.16-20030321> 21-Mar-2003: Upgraded package: P<gawk-3.1.2-20030321> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]