From 512b5ce682beae889b6d32b011771f1b63e36329 Mon Sep 17 00:00:00 2001 From: jbj Date: Wed, 20 Jun 2001 16:42:19 +0000 Subject: [PATCH] - fix: partial sets of hardlinked files permitted in payload (yes, changed). - work around a (possible) compiler problem on ia64. CVS patchset: 4893 CVS date: 2001/06/20 16:42:19 --- CHANGES | 3 ++- lib/fsm.c | 4 ++-- rpm.spec.in | 7 +++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 6bc32ae..e039833 100644 --- a/CHANGES +++ b/CHANGES @@ -122,8 +122,9 @@ - finalize per-header methods, accessing headerFoo through vector. - make package ordering loop messages debug, not warning. - remove {ia64,sparc}-linux.{prov,req}, changes merged into linux.*. - - fix: partial sets of hardlinked files forbidden in payload. + - fix: partial sets of hardlinked files permitted in payload. - fix: mark rpmdb files with %config to prevent erasure on downgrade. + - work around a (possible) compiler problem on ia64. 4.0 -> 4.0.[12] - add doxygen and lclint annotations most everywhere. diff --git a/lib/fsm.c b/lib/fsm.c index 51f8e8f..8363ae4 100644 --- a/lib/fsm.c +++ b/lib/fsm.c @@ -19,7 +19,7 @@ int _fsm_debug = 0; -static int all_hardlinks_in_package = 1; +static int all_hardlinks_in_package = 0; /* XXX Failure to remove is not (yet) cause for failure. */ /*@-exportlocal -exportheadervar@*/ @@ -1073,7 +1073,7 @@ static int fsmMkdirs(/*@special@*/ FSM_t fsm) (void) stpcpy(dn, fsm->path); fsm->path = dn; - /* Assume '/' directory exists, otherwise "mkdir -p" if non-existent. */ + /* Assume '/' directory exists, "mkdir -p" for others if non-existent */ for (i = 1, te = dn + 1; *te != '\0'; te++, i++) { if (*te != '/') continue; diff --git a/rpm.spec.in b/rpm.spec.in index ea8647d..f413e13 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -114,6 +114,13 @@ capabilities. %setup -q %build + +# +# XXX work around a (possible) compiler problem on ia64 +%ifarch ia64 +RPM_OPT_FLAGS="-O0" +#endif + %ifos linux CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --localstatedir=/var --infodir='${prefix}%{__share}/info' --mandir='${prefix}%{__share}/man' %else -- 2.7.4