gnu: cross-base: Fix PACKAGE-WITH-EXTRA-PATCHES

This also removes the execute bit from the patches added. Not sure how
or why those were set in the first place.

* gnu/packages/cross-base.scm (package-with-extra-patches): Imitate
PACKAGE-WITH-PATCH instead of using it.
* gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch:
Remove execute bit.
* gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch:
Remove execute bit.

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index dc63dc9..add1a6f 100644 (file)
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -76,11 +76,13 @@
     (source (origin (inherit (package-source original))
               (patches (list patch))))))
 
-(define (package-with-extra-patches original patches)
+(define (package-with-extra-patches original extra-patches)
   "Return package ORIGINAL with all PATCHES appended to its list of patches."
-  (package-with-patch original
-                      `(,@(origin-patches (package-source original))
-                        ,@patches)))
+  (let ((original-origin (package-source original)))
+    (package (inherit original)
+      (source (origin (inherit original-origin)
+                (patches `(,@extra-patches
+                           ,@(origin-patches original-origin))))))))
 
 (define (cross-binutils target)
   "Return a cross-Binutils for TARGET."

diff --git a/gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch b/gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch b/gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch
old mode 100755 (executable)
new mode 100644 (file)