diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rwxr-xr-x | db3/configure | 6 | ||||
| -rw-r--r-- | platform.in | 6 | ||||
| -rw-r--r-- | po/rpm.pot | 38 | ||||
| -rw-r--r-- | python/rpmmodule.c | 2 | ||||
| -rw-r--r-- | rpm.spec.in | 1 | ||||
| -rw-r--r-- | rpmio/macro.c | 2 | ||||
| -rw-r--r-- | rpmio/rpmrpc.c | 2 | ||||
| -rwxr-xr-x | scripts/trpm | 6 | ||||
| -rw-r--r-- | zlib/crc32.h | 2 |
11 files changed, 37 insertions, 33 deletions
@@ -79,6 +79,7 @@ - lclint-3.0.0.19 fiddles. - simple automake wrapper for zlib. - splint fiddles. + - make peace with gcc-3.1, remove compiler cruft. 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/configure.in b/configure.in index ab2181ff2..878fba2c4 100644 --- a/configure.in +++ b/configure.in @@ -326,7 +326,9 @@ do AC_MSG_CHECKING(for $dir/include in INCPATH) if test -d $dir/include ; then - INCPATH="$INCPATH -I$dir/include" + if [ "$dir" != "/usr/local" ] ; then + INCPATH="$INCPATH -I$dir/include" + fi AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) diff --git a/db3/configure b/db3/configure index acf99ede6..0c5b68722 100755 --- a/db3/configure +++ b/db3/configure @@ -5,15 +5,15 @@ db_dist="../db/dist" rm -f config.cache # XXX hacks to get db-3.3.4 to configure properly -ln -sf ../dist $db_dist/../db/dist -ln -sf ../dist $db_dist +#ln -sf ../dist $db_dist/../db/dist +#ln -sf ../dist $db_dist #CFLAGS="-O2 -D_GNU_SOURCE -D_REENTRANT" CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \ `echo $* | sed -e "s% --cache-file=.*$% --enable-shared --enable-static --enable-debug --enable-rpc --with-uniquename=_rpmdb --srcdir=$db_dist%"` # XXX hack to get db-3.3.4 to configure properly -rm -f $db_dist/../db/dist $db_dist/dist +#rm -f $db_dist/../db/dist $db_dist/dist mv Makefile Makefile.orig cat Makefile.orig | sed -e 's/ -g$/ -g -O2/' -e '/^install:/c\ diff --git a/platform.in b/platform.in index 5c94ee451..cff01c33e 100644 --- a/platform.in +++ b/platform.in @@ -114,8 +114,10 @@ @redhat@#--------------------------------------------------------------------- @redhat@# Always use %defattr(-,root,root) in %files (added in rpm-4.0.4) @redhat@# -@redhat@%files(n:f:) %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\ -@redhat@%defattr(-,root,root,-) +@redhat@#%files(n:f:) %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\ +@redhat@#%defattr(-,root,root,-)\ +@redhat@#%{nil} + @mandrake@#--------------------------------------------------------------------- @mandrake@# Mandrake vendor specific macros diff --git a/po/rpm.pot b/po/rpm.pot index 4478644f0..54218ea05 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-02-10 11:19-0500\n" +"POT-Creation-Date: 2002-02-10 13:58-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3144,93 +3144,93 @@ msgstr "" msgid "failed to remove directory %s: %s\n" msgstr "" -#: rpmio/macro.c:228 +#: rpmio/macro.c:226 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: rpmio/macro.c:355 +#: rpmio/macro.c:353 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: rpmio/macro.c:398 +#: rpmio/macro.c:396 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: rpmio/macro.c:633 +#: rpmio/macro.c:631 #, c-format msgid "Macro %%%s has unterminated body\n" msgstr "" -#: rpmio/macro.c:662 +#: rpmio/macro.c:660 #, c-format msgid "Macro %%%s has illegal name (%%define)\n" msgstr "" -#: rpmio/macro.c:668 +#: rpmio/macro.c:666 #, c-format msgid "Macro %%%s has unterminated opts\n" msgstr "" -#: rpmio/macro.c:673 +#: rpmio/macro.c:671 #, c-format msgid "Macro %%%s has empty body\n" msgstr "" -#: rpmio/macro.c:679 +#: rpmio/macro.c:677 #, c-format msgid "Macro %%%s failed to expand\n" msgstr "" -#: rpmio/macro.c:716 +#: rpmio/macro.c:714 #, c-format msgid "Macro %%%s has illegal name (%%undefine)\n" msgstr "" -#: rpmio/macro.c:828 +#: rpmio/macro.c:826 #, c-format msgid "Macro %%%s (%s) was not used below level %d\n" msgstr "" -#: rpmio/macro.c:948 +#: rpmio/macro.c:946 #, c-format msgid "Unknown option %c in %s(%s)\n" msgstr "" -#: rpmio/macro.c:1149 +#: rpmio/macro.c:1147 #, c-format msgid "Recursion depth(%d) greater than max(%d)\n" msgstr "" -#: rpmio/macro.c:1218 rpmio/macro.c:1235 +#: rpmio/macro.c:1216 rpmio/macro.c:1233 #, c-format msgid "Unterminated %c: %s\n" msgstr "" -#: rpmio/macro.c:1276 +#: rpmio/macro.c:1274 #, c-format msgid "A %% is followed by an unparseable macro\n" msgstr "" -#: rpmio/macro.c:1405 +#: rpmio/macro.c:1403 #, c-format msgid "Macro %%%.*s not found, skipping\n" msgstr "" -#: rpmio/macro.c:1481 +#: rpmio/macro.c:1479 msgid "Target buffer overflow\n" msgstr "" #. XXX Fstrerror -#: rpmio/macro.c:1680 rpmio/macro.c:1686 +#: rpmio/macro.c:1678 rpmio/macro.c:1684 #, c-format msgid "File %s: %s\n" msgstr "" -#: rpmio/macro.c:1689 +#: rpmio/macro.c:1687 #, c-format msgid "File %s is smaller than %u bytes\n" msgstr "" diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 1f97462ac..079e0b057 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -2590,7 +2590,7 @@ void initrpm(void) { while (extensions->name) { if (extensions->type == HEADER_EXT_TAG) { (const struct headerSprintfExtension *) ext = extensions; - PyDict_SetItemString(d, extensions->name, o=PyCObject_FromVoidPtr(ext, NULL)); + PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL)); Py_DECREF(o); PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7)); Py_DECREF(o); diff --git a/rpm.spec.in b/rpm.spec.in index 416f7064d..44cd25601 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -645,3 +645,4 @@ fi - query/verify by install transaction id. - rpm-4.0.4 release candidate. - add cpanflute2, another perl.req fiddle. +- make peace with gcc-3.1, remove compiler cruft. diff --git a/rpmio/macro.c b/rpmio/macro.c index 8bb179a9e..1493689ef 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -3,8 +3,6 @@ * \file rpmio/macro.c */ -/*@unused@*/ static int _debug = 0; - #include "system.h" #include <stdarg.h> diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c index 7669f80f2..df4dcd13a 100644 --- a/rpmio/rpmrpc.c +++ b/rpmio/rpmrpc.c @@ -755,7 +755,7 @@ vfs_parse_ls_lga (char * p, /*@out@*/ struct stat * st, int tlen; char *t; - t = g_strdup (p_copy + column_ptr [idx++]); + t = g_strdup (p_copy + column_ptr [idx]); idx++; tlen = strlen (t); /* g_strchomp(); */ if (t [tlen-1] == '\r' || t [tlen-1] == '\n') diff --git a/scripts/trpm b/scripts/trpm index 4cba02b15..637929f10 100755 --- a/scripts/trpm +++ b/scripts/trpm @@ -54,6 +54,7 @@ chkconfig- db1-1 db2-2 db3-3 +db4-4 dev- diffutils- e2fsprogs-1 @@ -124,11 +125,11 @@ bzip2-devel- db1-devel- db2-devel- db3-devel- +db4-devel- gdbm-devel- glibc-devel- gmp-devel- kernel-headers- -ncurses-devel- readline-devel-[24] tcl- zlib-devel- @@ -143,6 +144,7 @@ binutils- cpp- cvs- db3-utils- +db4-utils- egcs-1 egcs-c++-1 gcc-2 @@ -154,6 +156,7 @@ libstdc++- libtool- make- m4- +ncurses-devel- openssl-0 patch- perl-5 @@ -197,7 +200,6 @@ EOF %_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm %_rpmdir %{_topdir}/RPMS %_srcrpmdir %{_topdir}/SRPMS -%_tmppath %{_topdir}/tmp EOF ;; manifest) diff --git a/zlib/crc32.h b/zlib/crc32.h index 8b5f0187e..40177eb27 100644 --- a/zlib/crc32.h +++ b/zlib/crc32.h @@ -52,7 +52,6 @@ static __inline__ uLong __partial_crc32(uLong crc, const Bytef *buf, uInt len, i #if 1 /* { */ #define DOlong(p, d) do { \ - int i; \ crc ^= *(p); \ if (copy) \ *(d) = *(p); \ @@ -76,7 +75,6 @@ static __inline__ uLong __partial_crc32(uLong crc, const Bytef *buf, uInt len, i if (n) { long *x = (long *)buf; long *y; - int j = n / 8; PREFETCH(x); PREFETCH(x+8); |