From ebdc9239ccdf7c27846f673478e1e44dd949a3e0 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <[email protected]>
Date: Tue, 19 May 2015 00:21:12 +0300
Subject: [PATCH 02/10] gnu: base: Fix a bug that occurs in non-Linux systems.
* gnu/packages/base.scm (tar): Apply patch.
* gnu/packages/patches/tar-d_ino_in_dirent-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
---
gnu-system.am | 1 +
gnu/packages/base.scm | 3 ++-
gnu/packages/patches/tar-d_ino_in_dirent-fix.patch | 27 ++++++++++++++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/tar-d_ino_in_dirent-fix.patch
diff --git a/gnu-system.am b/gnu-system.am
index d07c24e..efb0ce3 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -558,6 +558,7 @@ dist_patch_DATA = \
gnu/packages/patches/soprano-find-clucene.patch \
gnu/packages/patches/subversion-sqlite-3.8.9-fix.patch \
gnu/packages/patches/superlu-dist-scotchmetis.patch \
+ gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \
gnu/packages/patches/tcsh-fix-autotest.patch \
gnu/packages/patches/teckit-cstdio.patch \
gnu/packages/patches/texi2html-document-encoding.patch \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f2e7fb5..b4344ee 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -140,7 +140,8 @@ implementation offers several extensions over the standard utility.")
version ".tar.xz"))
(sha256
(base32
- "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4"))))
+ "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4"))
+ (patches (list (search-patch "tar-d_ino_in_dirent-fix.patch")))))
(build-system gnu-build-system)
(synopsis "Managing tar archives")
(description
diff --git a/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch b/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch
new file mode 100644
index 0000000..b4ea30f
--- /dev/null
+++ b/gnu/packages/patches/tar-d_ino_in_dirent-fix.patch
@@ -0,0 +1,27 @@
+This is fixed in e9ddc08da0982f36581ae5a8c7763453ff41cfe8.
+
+diff --git a/src/tar.c b/src/tar.c
+index 225c624..f8102e0 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -1341,14 +1341,18 @@ static char filename_terminator;
+ static char const *const sort_mode_arg[] = {
+ "none",
+ "name",
++#if D_INO_IN_DIRENT
+ "inode",
++#endif
+ NULL
+ };
+
+ static int sort_mode_flag[] = {
+ SAVEDIR_SORT_NONE,
+ SAVEDIR_SORT_NAME,
++#if D_INO_IN_DIRENT
+ SAVEDIR_SORT_INODE
++#endif
+ };
+
+ ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag);
+--
+2.3.7
\ No newline at end of file
--
2.4.1
