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 Date: 24-Jan-2003 15:48:47
Branch: HEAD Handle: 2003012414484700
Modified files:
openpkg-src/openpkg-tool
openpkg-build.pl
Log:
only strip --defines for new packages
Summary:
Revision Changes Path
1.46 +4 -4 openpkg-src/openpkg-tool/openpkg-build.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================================
$ cvs diff -u -r1.45 -r1.46 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 24 Jan 2003 13:46:54 -0000 1.45
+++ openpkg-src/openpkg-tool/openpkg-build.pl 24 Jan 2003 14:48:47 -0000 1.46
@@ -1723,8 +1723,8 @@
# then map the result to --define command line arguments
# suitable for rpm
#
-sub make_defines ($$$) {
- my($old, $new, $c) = @_;
+sub make_defines ($$$$) {
+ my($old, $new, $c, $rebuild) = @_;
my($with);
#
@@ -1737,7 +1737,7 @@
#
if ($old) {
$old = { %$old };
- unless (override_options($old, $new, $c->{optreg})) {
+ if (!override_options($old, $new, $c->{optreg}) && !$rebuild) {
return '';
}
} else {
@@ -1790,7 +1790,7 @@
if ($uncond || !-f $bpkg ||
!target_suitable(binary_target($_, $bpkg),$with)) {
- $opt = make_defines($_->{OPTIONS}, $with, $c);
+ $opt = make_defines($_->{OPTIONS}, $with, $c, $_->{REBUILD});
#
# proxy packages are rebuilt from their maste
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
