fam: add patch for gcc 4.4 and later

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 64 insertions, 33 deletions

diff --git a/patches/fam-2.7.0/fam-2.7.0-includes.diff b/patches/fam-2.7.0/0001-fix-issues-with-newer-compilers.patch
index e977f4d5f..ca57a2f2e 100644
--- a/patches/fam-2.7.0/fam-2.7.0-includes.diff
+++ b/patches/fam-2.7.0/0001-fix-issues-with-newer-compilers.patch
@@ -1,11 +1,11 @@
-Subject: [patch] fix issues with newer compilers
 From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 12 Feb 2011 22:21:18 +0100
+Subject: [PATCH] fix issues with newer compilers
 
 The fam packet has several issues with newer gcc compilers, which are
 fixed by this patch.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
 ---
  include/BTree.h |    2 ++
  lib/Client.c++  |    2 +-
@@ -13,10 +13,23 @@ Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
  src/Interest.h  |    2 ++
  4 files changed, 6 insertions(+), 2 deletions(-)
 
-Index: fam-2.7.0/lib/Client.c++
-===================================================================
---- fam-2.7.0.orig/lib/Client.c++
-+++ fam-2.7.0/lib/Client.c++
+diff --git a/include/BTree.h b/include/BTree.h
+index 29ea94f..f978bda 100644
+--- a/include/BTree.h
++++ b/include/BTree.h
+@@ -23,6 +23,8 @@
+ #ifndef BTree_included
+ #define BTree_included
+ 
++#include <cstdlib>
++
+ #include "Boolean.h"
+ 
+ //  This is an in-core B-Tree implementation.
+diff --git a/lib/Client.c++ b/lib/Client.c++
+index fa62eb4..c3c4631 100644
+--- a/lib/Client.c++
++++ b/lib/Client.c++
 @@ -34,7 +34,7 @@
  #include <syslog.h>
  #include <errno.h>
@@ -26,23 +39,10 @@ Index: fam-2.7.0/lib/Client.c++
  
  #include "fam.h"
  #include "Client.h"
-Index: fam-2.7.0/src/Interest.h
-===================================================================
---- fam-2.7.0.orig/src/Interest.h
-+++ fam-2.7.0/src/Interest.h
-@@ -23,6 +23,8 @@
- #ifndef Interest_included
- #define Interest_included
- 
-+#include <cstdlib>
-+
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/time.h>
-Index: fam-2.7.0/src/IMon.c++
-===================================================================
---- fam-2.7.0.orig/src/IMon.c++
-+++ fam-2.7.0/src/IMon.c++
+diff --git a/src/IMon.c++ b/src/IMon.c++
+index ea53a49..2dcbed0 100644
+--- a/src/IMon.c++
++++ b/src/IMon.c++
 @@ -40,7 +40,7 @@
  #include "Interest.h"
  #include "Log.h"
@@ -52,16 +52,19 @@ Index: fam-2.7.0/src/IMon.c++
  
  int		   IMon::imonfd = -2;
  IMon::EventHandler IMon::ehandler = NULL;
-Index: fam-2.7.0/include/BTree.h
-===================================================================
---- fam-2.7.0.orig/include/BTree.h
-+++ fam-2.7.0/include/BTree.h
+diff --git a/src/Interest.h b/src/Interest.h
+index af95256..8ae551d 100644
+--- a/src/Interest.h
++++ b/src/Interest.h
 @@ -23,6 +23,8 @@
- #ifndef BTree_included
- #define BTree_included
+ #ifndef Interest_included
+ #define Interest_included
  
 +#include <cstdlib>
 +
- #include "Boolean.h"
- 
- //  This is an in-core B-Tree implementation.
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+-- 
+1.7.2.3
+
diff --git a/patches/fam-2.7.0/0002-fix-build-for-gcc-4.4-and-later.patch b/patches/fam-2.7.0/0002-fix-build-for-gcc-4.4-and-later.patch
new file mode 100644
index 000000000..94385c139
--- /dev/null
+++ b/patches/fam-2.7.0/0002-fix-build-for-gcc-4.4-and-later.patch
@@ -0,0 +1,25 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 12 Feb 2011 22:21:29 +0100
+Subject: [PATCH] fix build for gcc 4.4 and later
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/NFSFileSystem.c++ |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/NFSFileSystem.c++ b/src/NFSFileSystem.c++
+index 65c0b4e..3826a24 100644
+--- a/src/NFSFileSystem.c++
++++ b/src/NFSFileSystem.c++
+@@ -97,7 +97,7 @@ NFSFileSystem::NFSFileSystem(const mntent& mnt)
+ 
+     attr_cache_timeout = ACREGMAX;
+ 
+-    char * p;
++    const char * p;
+         
+     if (strstr(opt, "noac")) {
+         f_noac = true;
+-- 
+1.7.2.3
+
diff --git a/patches/fam-2.7.0/series b/patches/fam-2.7.0/series
index 5c77bed8d..f055ed41f 100644
--- a/patches/fam-2.7.0/series
+++ b/patches/fam-2.7.0/series
@@ -1 +1,4 @@
-fam-2.7.0-includes.diff
+# generated by git-ptx-patches
+0001-fix-issues-with-newer-compilers.patch
+0002-fix-build-for-gcc-4.4-and-later.patch
+# 9f93146a5570a257e65f401ab601dad1  - git-ptx-patches magic