Skip to Content.
Sympa Menu

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

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 (0305fa537533b0b4af5629eebf226863cdda4cf7)
  • Date: Mon, 1 Oct 2007 11:15:13 -0500

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

libs/elfutils/HISTORY | 5 +++++
libs/elfutils/PRE_BUILD | 2 +-
libs/elfutils/unset-file-offset.patch | 23 +++++++++++++++++------
3 files changed, 23 insertions(+), 7 deletions(-)

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

elfutils: Adjusted patch to move unset's to just before #include fts.h.
Good troubleshooting by dmlb200. :)

diff --git a/libs/elfutils/HISTORY b/libs/elfutils/HISTORY
index c9a9aaf..1f2b1c0 100644
--- a/libs/elfutils/HISTORY
+++ b/libs/elfutils/HISTORY
@@ -1,3 +1,8 @@
+2007-10-01 George Sherwood <george AT beernabeer.com>
+ * PRE_BUILD: Adjusted to -p0
+ * unset-file-offset.patch: moved unset's to just above
+ fts.h. Other includes must have been causing problems.
+
2007-09-30 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added patch unset-file-offset.patch
* unset-file-offset.patch: unset the __USE_FILE_OFFSET64 since that's
diff --git a/libs/elfutils/PRE_BUILD b/libs/elfutils/PRE_BUILD
index bae6851..ad9028c 100755
--- a/libs/elfutils/PRE_BUILD
+++ b/libs/elfutils/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
patch -p1 < $SCRIPT_DIRECTORY/$SPELL-$VERSION-portability.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/unset-file-offset.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/unset-file-offset.patch &&
sed -i "s/-Werror//" */Makefile.in &&
sedit "/^addr/s/)/) \$(libelf)/" src/Makefile.am &&
sedit "/^line2addr_LDADD/s/)/) \$(libelf)/" tests/Makefile.am &&
diff --git a/libs/elfutils/unset-file-offset.patch
b/libs/elfutils/unset-file-offset.patch
index aeb7050..aa11c55 100644
--- a/libs/elfutils/unset-file-offset.patch
+++ b/libs/elfutils/unset-file-offset.patch
@@ -1,10 +1,21 @@
---- a/libdwfl/linux-kernel-modules.c 2007-09-30 20:06:10.000000000 -0700
-+++ b/libdwfl/linux-kernel-modules.c 2007-09-30 20:06:27.000000000 -0700
-@@ -49,6 +49,7 @@
+--- libdwfl/linux-kernel-modules.c.orig 2007-08-15 03:28:27.000000000
+0500
++++ libdwfl/linux-kernel-modules.c 2007-10-01 20:46:01.000000000 +0500
+@@ -48,8 +48,6 @@
+ <http://www.openinventionnetwork.com>. */

#include <config.h>
- #undef _FILE_OFFSET_BITS /* Doesn't jibe with fts. */
-+#undef __USE_FILE_OFFSET64
-
+-#undef _FILE_OFFSET_BITS /* Doesn't jibe with fts. */
+-
#include "libdwflP.h"
#include <inttypes.h>
+ #include <errno.h>
+@@ -60,6 +58,9 @@
+ #include <sys/utsname.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#undef _FILE_OFFSET_BITS /* Doesn't jibe with fts. */
++#undef __USE_FILE_OFFSET64
++
+ #include <fts.h>
+
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (0305fa537533b0b4af5629eebf226863cdda4cf7), George Sherwood, 10/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page