Skip to Content.
Sympa Menu

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

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 (0a600aab9b46771e1989d0f04ae82eaff0686e79)
  • Date: Sat, 21 Aug 2010 13:44:24 -0500

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

utils/fam/HISTORY | 5 +++++
utils/fam/PRE_BUILD | 3 ++-
utils/fam/fam-2.7.0-huita.patch | 11 +++++++++++
3 files changed, 18 insertions(+), 1 deletion(-)

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

fam: Added Gentoo fix for compilation problem. Bug #15800

diff --git a/utils/fam/HISTORY b/utils/fam/HISTORY
index 5ae9c91..87daae0 100644
--- a/utils/fam/HISTORY
+++ b/utils/fam/HISTORY
@@ -1,3 +1,8 @@
+2010-08-21 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Added Gentoo patch for gcc 4.4. Bug 15800.
+ http://bugs.gentoo.org/show_bug.cgi?id=272316
+ * fam-2.7.0-huita.patch: Added patch.
+
2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
* DEPENDS: changed portmap dependency to PORT-MAPPER provider

diff --git a/utils/fam/PRE_BUILD b/utils/fam/PRE_BUILD
index 1e09840..240a65f 100755
--- a/utils/fam/PRE_BUILD
+++ b/utils/fam/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SCRIPT_DIRECTORY/fam-2.7.0-dnotify-1.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/fam-gcc43.patch
+patch -p0 < $SCRIPT_DIRECTORY/fam-gcc43.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/fam-2.7.0-huita.patch
diff --git a/utils/fam/fam-2.7.0-huita.patch b/utils/fam/fam-2.7.0-huita.patch
new file mode 100644
index 0000000..c9ca0cb
--- /dev/null
+++ b/utils/fam/fam-2.7.0-huita.patch
@@ -0,0 +1,11 @@
+--- fam-2.7.0-orig/src/NFSFileSystem.c++ 2009-06-03 19:20:51.000000000
+0300
++++ fam-2.7.0/src/NFSFileSystem.c++ 2009-06-03 19:21:57.000000000 +0300
+@@ -97,7 +97,7 @@
+
+ attr_cache_timeout = ACREGMAX;
+
+- char * p;
++ const char * p;
+
+ if (strstr(opt, "noac")) {
+ f_noac = true;



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (0a600aab9b46771e1989d0f04ae82eaff0686e79), George Sherwood, 08/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page