rpms/fusecompress/devel fusecompress-1.99.14-gcc43.patch, NONE, 1.1 fusecompress.spec, 1.2, 1.3
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Mon Apr 7 11:10:47 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/fusecompress/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7649/devel
Modified Files:
fusecompress.spec
Added Files:
fusecompress-1.99.14-gcc43.patch
Log Message:
Fix build with gcc43
fusecompress-1.99.14-gcc43.patch:
--- NEW FILE fusecompress-1.99.14-gcc43.patch ---
The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in
unnecessary dependencies which aren't requested by the standard.
This fixes build for gcc-4.3
Lubomir Kundrak <lkundrak at redhat.com>
diff -urp fusecompress-1.99.14.orig/src/Block.cpp fusecompress-1.99.14/src/Block.cpp
--- fusecompress-1.99.14.orig/src/Block.cpp 2007-03-09 14:18:54.000000000 +0100
+++ fusecompress-1.99.14/src/Block.cpp 2008-04-07 13:00:05.000000000 +0200
@@ -1,5 +1,6 @@
#include <stdint.h>
#include <cassert>
+#include <cstring>
#include "ByteOrder.hpp"
#include "Block.hpp"
diff -urp fusecompress-1.99.14.orig/src/CompressedTable.hpp fusecompress-1.99.14/src/CompressedTable.hpp
--- fusecompress-1.99.14.orig/src/CompressedTable.hpp 2007-02-05 08:26:46.000000000 +0100
+++ fusecompress-1.99.14/src/CompressedTable.hpp 2008-04-07 13:01:16.000000000 +0200
@@ -1,4 +1,5 @@
#include <set>
+#include <strings.h>
// #include <ext/hash_set>
using namespace std;
diff -urp fusecompress-1.99.14.orig/src/CompressMap.cpp fusecompress-1.99.14/src/CompressMap.cpp
--- fusecompress-1.99.14.orig/src/CompressMap.cpp 2007-11-02 08:34:25.000000000 +0100
+++ fusecompress-1.99.14/src/CompressMap.cpp 2008-04-07 13:00:05.000000000 +0200
@@ -1,4 +1,5 @@
#include <errno.h>
+#include <limits.h>
#include <cassert>
#include <ext/functional>
diff -urp fusecompress-1.99.14.orig/src/FileManager.cpp fusecompress-1.99.14/src/FileManager.cpp
--- fusecompress-1.99.14.orig/src/FileManager.cpp 2007-03-06 22:21:39.000000000 +0100
+++ fusecompress-1.99.14/src/FileManager.cpp 2008-04-07 13:00:05.000000000 +0200
@@ -3,6 +3,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <cstdlib>
#include <rlog/rlog.h>
diff -urp fusecompress-1.99.14.orig/src/FileRawCompressed.cpp fusecompress-1.99.14/src/FileRawCompressed.cpp
--- fusecompress-1.99.14.orig/src/FileRawCompressed.cpp 2007-11-02 08:50:01.000000000 +0100
+++ fusecompress-1.99.14/src/FileRawCompressed.cpp 2008-04-07 13:00:05.000000000 +0200
@@ -7,6 +7,9 @@
#include <cassert>
#include <errno.h>
#include <rlog/rlog.h>
+#include <cstdlib>
+#include <cstring>
+#include <strings.h>
#include <sys/types.h>
#include <sys/stat.h>
diff -urp fusecompress-1.99.14.orig/src/FuseCompress.cpp fusecompress-1.99.14/src/FuseCompress.cpp
--- fusecompress-1.99.14.orig/src/FuseCompress.cpp 2007-03-20 18:56:28.000000000 +0100
+++ fusecompress-1.99.14/src/FuseCompress.cpp 2008-04-07 13:00:05.000000000 +0200
@@ -5,6 +5,7 @@
#include <string.h>
#include <errno.h>
+#include <cstdlib>
#include <iostream>
#include <rlog/rlog.h>
diff -urp fusecompress-1.99.14.orig/src/main.cpp fusecompress-1.99.14/src/main.cpp
--- fusecompress-1.99.14.orig/src/main.cpp 2008-04-07 12:38:22.000000000 +0200
+++ fusecompress-1.99.14/src/main.cpp 2008-04-07 13:02:41.000000000 +0200
@@ -6,6 +6,8 @@
#include <dirent.h>
#include <fcntl.h>
#include <errno.h>
+#include <cstdlib>
+#include <cstring>
#include "FuseCompress.hpp"
#include "TransformTable.hpp"
diff -urp fusecompress-1.99.14.orig/src/main_offline.cpp fusecompress-1.99.14/src/main_offline.cpp
--- fusecompress-1.99.14.orig/src/main_offline.cpp 2007-11-03 14:40:16.000000000 +0100
+++ fusecompress-1.99.14/src/main_offline.cpp 2008-04-07 13:03:17.000000000 +0200
@@ -8,6 +8,7 @@
#include <string.h>
#include <stddef.h>
#include <ftw.h>
+#include <cstdlib>
#include "CompressedTable.hpp"
#include "Compress.hpp"
diff -urp fusecompress-1.99.14.orig/src/Memory.cpp fusecompress-1.99.14/src/Memory.cpp
--- fusecompress-1.99.14.orig/src/Memory.cpp 2007-11-02 08:39:34.000000000 +0100
+++ fusecompress-1.99.14/src/Memory.cpp 2008-04-07 13:00:05.000000000 +0200
@@ -3,6 +3,7 @@
#include <sstream>
#include <rlog/rlog.h>
#include <errno.h>
+#include <cstring>
#include <assert.h>
#include <signal.h>
diff -urp fusecompress-1.99.14.orig/src/MemoryMap.hpp fusecompress-1.99.14/src/MemoryMap.hpp
--- fusecompress-1.99.14.orig/src/MemoryMap.hpp 2007-11-02 08:31:25.000000000 +0100
+++ fusecompress-1.99.14/src/MemoryMap.hpp 2008-04-07 13:00:05.000000000 +0200
@@ -7,6 +7,7 @@
#include <utility>
#include <iostream>
#include <fstream>
+#include <cstring>
using namespace std;
diff -urp fusecompress-1.99.14.orig/src/TransformCompress.cpp fusecompress-1.99.14/src/TransformCompress.cpp
--- fusecompress-1.99.14.orig/src/TransformCompress.cpp 2007-03-21 09:30:05.000000000 +0100
+++ fusecompress-1.99.14/src/TransformCompress.cpp 2008-04-07 13:02:08.000000000 +0200
@@ -1,4 +1,5 @@
#include <errno.h>
+#include <cstring>
#include <rlog/rlog.h>
diff -urp fusecompress-1.99.14.orig/src/TransformTable.cpp fusecompress-1.99.14/src/TransformTable.cpp
--- fusecompress-1.99.14.orig/src/TransformTable.cpp 2007-03-04 12:16:54.000000000 +0100
+++ fusecompress-1.99.14/src/TransformTable.cpp 2008-04-07 13:01:39.000000000 +0200
@@ -1,4 +1,6 @@
#include "TransformTable.hpp"
+#include <cstdlib>
+#include <cstring>
#include <rlog/rlog.h>
Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/devel/fusecompress.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fusecompress.spec 7 Apr 2008 10:29:49 -0000 1.2
+++ fusecompress.spec 7 Apr 2008 11:10:08 -0000 1.3
@@ -1,6 +1,6 @@
Name: fusecompress
Version: 1.99.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: FUSE based compressed filesystem implementation
Group: System Environment/Libraries
@@ -9,6 +9,7 @@
Source0: http://miio.net/files/%{name}-%{version}.tar.gz
Source1: mount.fusecompress
Patch0: fusecompress-1.99.13-errno.patch
+Patch1: fusecompress-1.99.14-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: rlog-devel fuse-devel zlib-devel bzip2-devel
@@ -24,7 +25,8 @@
%prep
%setup -q
-%patch -p1 -b .errno
+%patch0 -p1 -b .errno
+%patch1 -p1 -b .gcc43
cp %{SOURCE1} mount.fusecompress
@@ -52,6 +54,9 @@
%changelog
+* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-3
+- Fix build with gcc43
+
* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.99.14-2
- move mount helper to doc
More information about the fedora-extras-commits
mailing list