[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: packages: Use '--no-backup-if-mismatch' for patching.
From: |
Manolis Fragkiskos Ragkousis |
Subject: |
01/07: packages: Use '--no-backup-if-mismatch' for patching. |
Date: |
Wed, 13 Jul 2016 14:45:44 +0000 (UTC) |
phant0mas pushed a commit to branch core-updates-next
in repository guix.
commit 21d2800acdd873fe2c4c0ad9c0f5608185f392e9
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 acb8f34..c29fb39 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.
;;;
@@ -465,9 +466,11 @@ IMPORTED-MODULES specify modules to use/import for use by
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 core-updates-next created (now b036d6d), Manolis Fragkiskos Ragkousis, 2016/07/13
- 02/07: gnu: curl: Update to 7.49.1., Manolis Fragkiskos Ragkousis, 2016/07/13
- 06/07: build: Correctly determine the system type for GNU/Hurd systems., Manolis Fragkiskos Ragkousis, 2016/07/13
- 07/07: gnu: guile: Use "site-ccache" for the compiled search path., Manolis Fragkiskos Ragkousis, 2016/07/13
- 03/07: utils: Fix 'modify-phases' docstring., Manolis Fragkiskos Ragkousis, 2016/07/13
- 01/07: packages: Use '--no-backup-if-mismatch' for patching.,
Manolis Fragkiskos Ragkousis <=
- 04/07: gnu: sqlite: Update to 3.13.0., Manolis Fragkiskos Ragkousis, 2016/07/13
- 05/07: gnu: wrap-python3: Create more symlinks., Manolis Fragkiskos Ragkousis, 2016/07/13