[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/10: packages: Use '--no-backup-if-mismatch' for patching.
From: |
Leo Famulari |
Subject: |
01/10: packages: Use '--no-backup-if-mismatch' for patching. |
Date: |
Wed, 10 Aug 2016 19:41:41 +0000 (UTC) |
lfam pushed a commit to branch WIP-core-updates
in repository guix.
commit 8d65c71f125798cf27c479b3e72ea61c9ba0d7b2
Author: Alex Kost <address@hidden>
Date: Thu May 19 19:11:58 2016 +0300
packages: Use '--no-backup-if-mismatch' for patching.
Suggested-by: Ludovic Courtès <address@hidden>
* guix/packages.scm (patch-and-repack)[build]: Use
'--no-backup-if-mismatch' patch flag to avoid making *.orig files.
---
guix/packages.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 3646b9b..728b3af 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
+;;; Copyright © 2016 Alex Kost <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -478,9 +479,11 @@ specifies modules in scope when evaluating SNIPPET."
(format (current-error-port) "applying '~a'...~%" patch)
;; Use '--force' so that patches that do not apply perfectly are
- ;; rejected.
+ ;; rejected. Use '--no-backup-if-mismatch' to prevent making
+ ;; "*.orig" file if a patch is applied with offset.
(zero? (system* (string-append #+patch "/bin/patch")
- "--force" address@hidden "--input" patch)))
+ "--force" "--no-backup-if-mismatch"
+ address@hidden "--input" patch)))
(define (first-file directory)
;; Return the name of the first file in DIRECTORY.
- branch WIP-core-updates updated (dd05e73 -> 9f58fe3), Leo Famulari, 2016/08/10
- 01/10: packages: Use '--no-backup-if-mismatch' for patching.,
Leo Famulari <=
- 03/10: utils: Fix 'modify-phases' docstring., Leo Famulari, 2016/08/10
- 02/10: gnu: curl: Update to 7.50.1., Leo Famulari, 2016/08/10
- 06/10: build: Correctly determine the system type for GNU/Hurd systems., Leo Famulari, 2016/08/10
- 04/10: gnu: sqlite: Update to 3.13.0., Leo Famulari, 2016/08/10
- 07/10: gnu: guile: Use "site-ccache" for the compiled search path., Leo Famulari, 2016/08/10
- 09/10: gnu: cross-libc: Cross build the correct libc for GNU/Hurd systems., Leo Famulari, 2016/08/10
- 08/10: gnu: commencement: Add support for a native GNU/Hurd system., Leo Famulari, 2016/08/10
- 05/10: gnu: wrap-python3: Create more symlinks., Leo Famulari, 2016/08/10
- 10/10: gnu: glibc/linux: Adjust variable name to upstream change., Leo Famulari, 2016/08/10