Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (dd836586c1bbd2354d7897cdbd075012ebfba146)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (dd836586c1bbd2354d7897cdbd075012ebfba146)
  • Date: Mon, 15 Dec 2008 08:45:31 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

utils/fam/BUILD | 1
utils/fam/HISTORY | 5 +++
utils/fam/PRE_BUILD | 4 +++
utils/fam/fam-gcc43.patch | 59
++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 68 insertions(+), 1 deletion(-)

New commits:
commit dd836586c1bbd2354d7897cdbd075012ebfba146
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

fam: Added patch to build with gcc 4.3.x. Move patche
from BUILD to PRE_BUILD

diff --git a/utils/fam/BUILD b/utils/fam/BUILD
index 8b71274..fe9783f 100755
--- a/utils/fam/BUILD
+++ b/utils/fam/BUILD
@@ -1,4 +1,3 @@
- patch -p1 < $SCRIPT_DIRECTORY/fam-2.7.0-dnotify-1.patch &&
chmod 755 configure &&
autoreconf -f -i &&
default_build
diff --git a/utils/fam/HISTORY b/utils/fam/HISTORY
index d20520b..47a23be 100644
--- a/utils/fam/HISTORY
+++ b/utils/fam/HISTORY
@@ -1,3 +1,8 @@
+2008-12-15 George Sherwood <gsherwood AT sourcemage.org>
+ * BUILD: Moved patch to PRE_BUILD
+ * PRE_BUILD: Added files for patches.
+ * fam-gcc43: Added gentoo patch to fix building with gcc 4.3.x
+
2006-12-18 Thomas Orgis <sobukus AT sourcemage.org>
* fam...dnotify.patch: removed doubled class identifier in the header
gcc doesn't like that in general and gcc-4.1.1 even chokes on it
diff --git a/utils/fam/PRE_BUILD b/utils/fam/PRE_BUILD
new file mode 100755
index 0000000..1e09840
--- /dev/null
+++ b/utils/fam/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/fam-2.7.0-dnotify-1.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/fam-gcc43.patch
diff --git a/utils/fam/fam-gcc43.patch b/utils/fam/fam-gcc43.patch
new file mode 100644
index 0000000..91af109
--- /dev/null
+++ b/utils/fam/fam-gcc43.patch
@@ -0,0 +1,59 @@
+diff -Naur include/BTree.h include/BTree.h
+--- include/BTree.h 2003-01-19 22:22:30.000000000 -0600
++++ include/BTree.h 2008-12-04 17:51:22.000000000 -0600
+@@ -24,6 +24,7 @@
+ #define BTree_included
+
+ #include "Boolean.h"
++#include <cstdlib>
+
+ // This is an in-core B-Tree implementation.
+ //
+diff -Naur lib/Client.c++ lib/Client.c++
+--- lib/Client.c++ 2003-01-18 08:18:12.000000000 -0600
++++ lib/Client.c++ 2008-12-04 17:51:19.000000000 -0600
+@@ -34,7 +34,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+
+-#include <iostream.h>
++#include <iostream>
+
+ #include "fam.h"
+ #include "Client.h"
+diff -Naur src/DNotify.c++ src/DNotify.c++
+--- src/DNotify.c++ 2008-12-04 17:50:48.000000000 -0600
++++ src/DNotify.c++ 2008-12-04 17:51:19.000000000 -0600
+@@ -31,6 +31,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <libgen.h>
++#include <cstdlib>
+
+ #include "DNotify.h"
+
+diff -Naur src/IMon.c++ src/IMon.c++
+--- src/IMon.c++ 2003-01-18 08:18:12.000000000 -0600
++++ src/IMon.c++ 2008-12-04 17:51:19.000000000 -0600
+@@ -40,7 +40,7 @@
+ #include "Interest.h"
+ #include "Log.h"
+ #include "Scheduler.h"
+-#include "alloc.h"
++#include <memory>
+
+ int IMon::imonfd = -2;
+ IMon::EventHandler IMon::ehandler = NULL;
+diff -Naur src/Interest.h src/Interest.h
+--- src/Interest.h 2008-12-04 17:50:48.000000000
+-0600
++++ src/Interest.h 2008-12-04 17:51:22.000000000 -0600
+@@ -29,6 +29,7 @@
+ #include <netinet/in.h> // for in_addr
+
+ #include "Boolean.h"
++#include <cstdlib>
+
+ class Event;
+ class FileSystem;
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (dd836586c1bbd2354d7897cdbd075012ebfba146), George Sherwood, 12/15/2008

Archive powered by MHonArc 2.6.24.

Top of Page