From: Manolis Ragkousis <manolis837@gmail.com>
To: Guix-devel <Guix-devel@gnu.org>
Subject: Problem with patching tar
Date: Tue, 5 May 2015 09:52:50 +0300 [thread overview]
Message-ID: <CAFtzXzOfeADbM9OHM7A0JrCG6c8AoCwnNGYXUnRvGwfY1BSXSg@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 456 bytes --]
Good morning guix
When I try to patch tar I get "(vm-run "VM: Stack overflow" ())",
probably, because it tries to use patch but it does not yet exist and
I get the chicken-egg problem.
I created patch-final in commencement.scm and added it to %boot6-inputs
which are used to build %final-inputs. But I am still not able to patch tar.
After Ludo's suggestion I post the patch and the backtrace.
http://paste.lisp.org/display/147854
Any ideas?
Manolis
[-- Attachment #2: 0001-gnu-base-tar-bugfixes.patch --]
[-- Type: text/x-patch, Size: 3717 bytes --]
From 463d929cc3d6f07f86f4737a94679bf102a77661 Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Tue, 5 May 2015 09:32:46 +0300
Subject: [PATCH] gnu: base: tar bugfixes
---
gnu-system.am | 1 +
gnu/packages/base.scm | 3 ++-
gnu/packages/commencement.scm | 10 ++++++++-
.../patches/tar-d_ino_in_dirent-bugfix.patch | 25 ++++++++++++++++++++++
4 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/tar-d_ino_in_dirent-bugfix.patch
diff --git a/gnu-system.am b/gnu-system.am
index be09434..3f4100d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -543,6 +543,7 @@ dist_patch_DATA = \
gnu/packages/patches/slim-sigusr1.patch \
gnu/packages/patches/soprano-find-clucene.patch \
gnu/packages/patches/superlu-dist-scotchmetis.patch \
+ gnu/packages/patches/tar-d_ino_in_dirent-bugfix.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 1cecc52..bbac3ac 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -139,7 +139,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-bugfix.patch")))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("CPPFLAGS=-DPATH_MAX=4096")))
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4a9fc5b..762658b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -614,6 +614,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
,@(fold alist-delete (package-inputs ld-wrapper-boot3)
'("guile" "bash"))))))
+(define patch-final
+ (package-with-bootstrap-guile
+ (package-with-explicit-inputs patch
+ %boot5-inputs
+ (current-source-location)
+ #:guile guile-final)))
+
(define coreutils-final
;; The final Coreutils. Treat them specially because some packages, such as
;; Findutils, keep a reference to the Coreutils they were built with.
@@ -639,7 +646,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define %boot6-inputs
;; Now use the final Coreutils.
- `(("coreutils" ,coreutils-final)
+ `(("patch" ,patch-final)
+ ("coreutils" ,coreutils-final)
("grep" ,grep-final)
,@%boot5-inputs))
diff --git a/gnu/packages/patches/tar-d_ino_in_dirent-bugfix.patch b/gnu/packages/patches/tar-d_ino_in_dirent-bugfix.patch
new file mode 100644
index 0000000..e115265
--- /dev/null
+++ b/gnu/packages/patches/tar-d_ino_in_dirent-bugfix.patch
@@ -0,0 +1,25 @@
+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.3.7
next reply other threads:[~2015-05-05 6:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-05 6:52 Manolis Ragkousis [this message]
2015-05-05 16:13 ` Problem with patching tar Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFtzXzOfeADbM9OHM7A0JrCG6c8AoCwnNGYXUnRvGwfY1BSXSg@mail.gmail.com \
--to=manolis837@gmail.com \
--cc=Guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.