git.annexia.org
/
fedora-mingw.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4377c04
)
Remember which libraries we've asked the user to install already.
author
Richard W.M. Jones
<rjones@redhat.com>
Wed, 10 Sep 2008 15:10:34 +0000
(16:10 +0100)
committer
Richard W.M. Jones
<rjones@redhat.com>
Wed, 10 Sep 2008 15:10:34 +0000
(16:10 +0100)
Ignore mingw-example.
BUILD.pl
patch
|
blob
|
history
diff --git
a/BUILD.pl
b/BUILD.pl
index
5a65199
..
ae67a93
100755
(executable)
--- a/
BUILD.pl
+++ b/
BUILD.pl
@@
-56,6
+56,7
@@
sub main {
delete $br{"mingw-cyrus-sasl"};
delete $br{"mingw-nsis"};
delete $br{"mingw-wix"};
delete $br{"mingw-cyrus-sasl"};
delete $br{"mingw-nsis"};
delete $br{"mingw-wix"};
+ delete $br{"mingw-example"};
# There is a dependency loop (gcc -> runtime/w32api -> gcc)
# which has to be manually resolved below. Break that loop.
# There is a dependency loop (gcc -> runtime/w32api -> gcc)
# which has to be manually resolved below. Break that loop.
@@
-84,6
+85,8
@@
sub main {
unlink "/tmp/tsort2.tmp";
}
unlink "/tmp/tsort2.tmp";
}
+ my %installed;
+
while (<PACKAGES>) {
chomp;
if (/^mingw-(.*)/) {
while (<PACKAGES>) {
chomp;
if (/^mingw-(.*)/) {
@@
-97,8
+100,9
@@
sub main {
# Are all BR RPMs installed?
my $br;
foreach $br (@brs) {
# Are all BR RPMs installed?
my $br;
foreach $br (@brs) {
- if (! rpm_installed ($br)) {
+ if (! rpm_installed ($br)
&& !exists $installed{$br}
) {
print "as root # rpm -Uvh $br*.rpm\n";
print "as root # rpm -Uvh $br*.rpm\n";
+ $installed{$br} = 1;
}
}
}
}
@@
-107,7
+111,8
@@
sub main {
(!rpm_installed ("mingw-runtime") ||
!rpm_installed ("mingw-w32api"))) {
print "rpmbuild -ba bootstrap/mingw-bootstrap.spec\n";
(!rpm_installed ("mingw-runtime") ||
!rpm_installed ("mingw-w32api"))) {
print "rpmbuild -ba bootstrap/mingw-bootstrap.spec\n";
- print "as root # rpm -Uvh mingw-bootstrap*.rpm\n"
+ print "as root # rpm -Uvh mingw-bootstrap*.rpm\n";
+ $installed{"mingw-bootstrap"} = 1;
}
# Spec file.
}
# Spec file.