[SM-Commit] GIT changes to master grimoire by David Brown (79572b870aadc144c2905547496df4ab40cdb139)

David Brown scm at sourcemage.org
Sat Sep 15 14:30:51 EDT 2007


GIT changes to master grimoire by David Brown <dmlb2000 at gmail.com>:

 archive/cpio/HISTORY             |    5 +++++
 archive/cpio/PRE_BUILD           |    3 +++
 archive/cpio/cpio-futimens.patch |   27 +++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)

New commits:
commit 79572b870aadc144c2905547496df4ab40cdb139
Author: David Brown <dmlb2000 at gmail.com>
Commit: David Brown <dmlb2000 at gmail.com>

    cpio added glibc 2.6.1 futimens patch so it will compile with glibc 2.6.1

diff --git a/archive/cpio/HISTORY b/archive/cpio/HISTORY
index e523d98..40658d6 100644
--- a/archive/cpio/HISTORY
+++ b/archive/cpio/HISTORY
@@ -1,3 +1,8 @@
+2007-09-15 David Brown <dmlb2000 at gmail.com>
+	* PRE_BUILD: added futimens patch
+	* cpio-futimens.patch: makes it so the futimens patch is internal
+	  rather than conflicting with glibc 2.6.1 futimens
+
 2007-05-31 Remko van der Vossen <wich at stack.nl>
 	* DETAILS: Bumped version to 2.7
 	  Removed UPDATED
diff --git a/archive/cpio/PRE_BUILD b/archive/cpio/PRE_BUILD
new file mode 100755
index 0000000..6f1d422
--- /dev/null
+++ b/archive/cpio/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/cpio-futimens.patch
diff --git a/archive/cpio/cpio-futimens.patch b/archive/cpio/cpio-futimens.patch
new file mode 100644
index 0000000..6e490f3
--- /dev/null
+++ b/archive/cpio/cpio-futimens.patch
@@ -0,0 +1,27 @@
+diff -Nur cpio-2.7.org/lib/utimens.c cpio-2.7/lib/utimens.c
+--- cpio-2.7.org/lib/utimens.c	2006-09-27 08:06:57.000000000 +0000
++++ cpio-2.7/lib/utimens.c	2007-06-06 12:12:34.148446894 +0000
+@@ -73,7 +73,7 @@
+    Return 0 on success, -1 (setting errno) on failure.  */
+ 
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
++cpio_futimens (int fd ATTRIBUTE_UNUSED,
+ 	  char const *file, struct timespec const timespec[2])
+ {
+   /* There's currently no interface to set file timestamps with
+@@ -166,5 +166,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+-  return futimens (-1, file, timespec);
++  return cpio_futimens (-1, file, timespec);
+ }
+diff -Nur cpio-2.7.org/lib/utimens.h cpio-2.7/lib/utimens.h
+--- cpio-2.7.org/lib/utimens.h	2004-11-23 20:59:50.000000000 +0000
++++ cpio-2.7/lib/utimens.h	2007-06-06 12:12:34.148446894 +0000
+@@ -1,3 +1,3 @@
+ #include &quot;timespec.h&quot;
+-int futimens (int, char const *, struct timespec const [2]);
++int cpio_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);



More information about the SM-Commit mailing list