[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] gnu: gcj: remove broken symlink and stump binaries.
From: |
Ricardo Wurmus |
Subject: |
Re: [PATCH] gnu: gcj: remove broken symlink and stump binaries. |
Date: |
Sat, 2 May 2015 18:14:08 +0200 |
Ludovic Courtès writes:
>> + (for-each delete-file
>> + (map (cut string-append out <>)
>> + '("/lib/jvm/jre/lib/amd64/libjawt.so"
>> + "/bin/c++"
>> + "/bin/cpp"
>> + "/bin/g++"
>> + "/bin/gcc"
>> + "/bin/gcc-ar"
>> + "/bin/gcc-nm"
>> + "/bin/gcc-ranlib"
>> + "/bin/x86_64-unknown-linux-gnu-c++"
>> + "/bin/x86_64-unknown-linux-gnu-g++"
>> + "/bin/x86_64-unknown-linux-gnu-gcc"
>> + "/bin/x86_64-unknown-linux-gnu-gcc-4.8.4"
>> + "/bin/x86_64-unknown-linux-gnu-gcc-ar"
>> + "/bin/x86_64-unknown-linux-gnu-gcc-nm"
>> +
>> "/bin/x86_64-unknown-linux-gnu-gcc-ranlib"))))
>
> This is specific to x86_64-linux-gnu though. Wouldn’t it be better to
> use a white list instead, or maybe keep it a black list but use
> find-files and regexps?
Attached is a new patch using find-files and regular expressions. The
results look fine in the REPL, but I have not yet finished compiling the
gcj package (it takes a very long time on my machine).
~~ Ricardo
>From 86f2b4e7f182b5ea734eea4d72ef868b6a25f7eb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 30 Apr 2015 17:11:39 +0200
Subject: [PATCH] gnu: gcj: Remove broken symlink and conflicting files.
* gnu/packages/gcc.scm (gcj)[arguments]: Add a build phase to remove a broken
symlink and generic stump binaries.
---
gnu/packages/gcc.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index e712e43..aa3e046 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -435,7 +435,18 @@ Go. It also includes runtime support libraries for these
languages.")
(string-append jvm "/lib/tools.jar")))
(chmod target #o755)
#t))
- ,phases))))))
+ (alist-cons-after
+ 'install 'remove-broken-or-conflicting-files
+ (lambda _
+ (let ((out (assoc-ref %outputs "out")))
+ (for-each
+ delete-file
+ (append (find-files (string-append out "/lib/jvm/jre/lib")
+ "libjawt.so")
+ (find-files (string-append out "/bin")
+ ".*(c\\+\\+|cpp|g\\+\\+|gcc.*)"))))
+ #t)
+ ,phases)))))))
(define ecj-bootstrap-4.8
(origin
--
2.1.0
- Re: [PATCH] gnu: gcj: remove broken symlink and stump binaries.,
Ricardo Wurmus <=