- gcc 3.4 fixes.

Changed files:
    bash-gcc34.patch -> 1.1
    bash.spec -> 1.132

diff --git a/bash-gcc34.patch b/bash-gcc34.patch
new file mode 100644 (file)
index 0000000..d4628b8
--- /dev/null
+++ b/bash-gcc34.patch
@@ -0,0 +1,28 @@
+--- bash-2.05b/lib/malloc/malloc.c.orig        2002-06-21 21:16:49.000000000 +0200
++++ bash-2.05b/lib/malloc/malloc.c     2004-03-01 10:07:19.749437536 +0100
+@@ -236,7 +236,7 @@
+       8192UL, 16384UL, 32768UL, 65536UL, 131072UL, 262144UL, 524288UL,
+       1048576UL, 2097152UL, 4194304UL, 8388608UL, 16777216UL, 33554432UL,
+       67108864UL, 134217728UL, 268435456UL, 536870912UL, 1073741824UL,
+-      2147483648UL, 4294967296UL-1
++      2147483648UL, 4294967295UL
+ };
+ 
+ /* binsizes[x] == (1 << ((x) + 3)) */
+@@ -290,7 +290,7 @@
+ 
+ #if !defined (botch)
+ static void
+-botch (s, file, line)
++botch (const char *s, const char *file, int line)
+ {
+   fprintf (stderr, "malloc: failed assertion: %s\n", s);
+   (void)fflush (stderr);
+@@ -879,6 +879,7 @@
+   busy[nunits] = 0;
+ 
+ free_return:
++  ((void)0);
+ 
+ #ifdef MALLOC_STATS
+   _mstats.nmalloc[nunits]--;

diff --git a/bash.spec b/bash.spec
index f4411ebb679a6eecee2a2db8ab3c92c1b95c84a0..9172cd94b90eaa2d0f36671f6ab65b79edaee508 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -43,6 +43,7 @@ Patch16:      ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-005
 Patch17:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-006
 Patch18:       ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05b-patches/bash205b-007
 Patch19:       %{name}-pmake.patch
+Patch20:       %{name}-gcc34.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -207,6 +208,7 @@ tym pakiecie jest wersja basha skonsolidowana statycznie.
 %patch17 -p0
 %patch18 -p0
 %patch19 -p1
+%patch20 -p1
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel