rpms/bonnie++/devel bonnie++-1.03a-gcc43.patch, NONE, 1.1 bonnie++.spec, 1.15, 1.16

Warren Togami 砥上勇 (wtogami) fedora-extras-commits at redhat.com
Mon Feb 11 19:20:23 UTC 2008


Author: wtogami

Update of /cvs/pkgs/rpms/bonnie++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2994

Modified Files:
	bonnie++.spec 
Added Files:
	bonnie++-1.03a-gcc43.patch 
Log Message:
add katzj's gcc-4.3 build fix


bonnie++-1.03a-gcc43.patch:

--- NEW FILE bonnie++-1.03a-gcc43.patch ---
diff -up bonnie++-1.03a/zcav.cpp.gcc43 bonnie++-1.03a/zcav.cpp
--- bonnie++-1.03a/zcav.cpp.gcc43	2008-02-08 20:19:25.000000000 -0500
+++ bonnie++-1.03a/zcav.cpp	2008-02-08 20:19:37.000000000 -0500
@@ -9,6 +9,7 @@ using namespace std;
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
 #include "bonnie.h"
 #ifdef HAVE_VECTOR
 #include <vector>
@@ -72,7 +73,7 @@ int main(int argc, char *argv[])
           usage();
         userName = strdup(optarg);
         int i;
-        for(i = 0; userName[i] && userName[i] != ':'; i++);
+        for(i = 0; userName[i] && userName[i] != ':'; i++) ;
         if(userName[i] == ':')
         {
           if(groupName)


Index: bonnie++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bonnie++/devel/bonnie++.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bonnie++.spec	8 Feb 2008 21:31:07 -0000	1.15
+++ bonnie++.spec	11 Feb 2008 19:19:34 -0000	1.16
@@ -11,6 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 Patch0:         bonnie++-1.03a-mandir.patch
+Patch1:         bonnie++-1.03a-gcc43.patch
 
 %description
 bonnie++ filesystem and disk benchmark suite aggressively reads & writes
@@ -24,7 +25,8 @@
 
 %prep
 %setup -q -n bonnie++-1.03a
-%patch -p0
+%patch0 -p0
+%patch1 -p1
 sed -i 's|${INSTALL}\s\+-s\b|${INSTALL}|' Makefile
 
 




More information about the fedora-extras-commits mailing list