From c1c50cb5b099897a18e4cd8c27970cb45a7c3a94 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Fri, 3 Apr 2020 13:46:17 -0400 Subject: [PATCH] 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. --- gnu/packages/cross-base.scm | 10 ++++++---- ...utils-mingw-w64-reproducible-import-libraries.patch | 0 .../patches/binutils-mingw-w64-specify-timestamp.patch | 0 3 files changed, 6 insertions(+), 4 deletions(-) mode change 100755 => 100644 gnu/packages/patches/binutils-mingw-w64-reproducible-import-libraries.patch mode change 100755 => 100644 gnu/packages/patches/binutils-mingw-w64-specify-timestamp.patch diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index dc63dc9462..add1a6fe91 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -76,11 +76,13 @@ (define (package-with-patch original patch) (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 new mode 100644 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 new mode 100644