guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

180/376: Don't rely on process substitution


From: Ludovic Courtès
Subject: 180/376: Don't rely on process substitution
Date: Wed, 28 Jan 2015 22:04:52 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit 72d684d592233829b785d5fbec10da6e9ce580df
Author: Eelco Dolstra <address@hidden>
Date:   Fri Sep 12 12:50:03 2014 +0200

    Don't rely on process substitution
---
 jars.mk |    4 +++-
 lib.mk  |    4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/jars.mk b/jars.mk
index a111783..c8513e6 100644
--- a/jars.mk
+++ b/jars.mk
@@ -16,7 +16,9 @@ define build-jar
        $$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d 
$$($(1)_TMPDIR) \
          $$(foreach fn, $$($(1)_SOURCES), '$$(fn)') \
          -cp "$$(subst $$(space),,$$(foreach 
jar,$$($(1)_JARS),$$($$(jar)_PATH):))$$$$CLASSPATH"
-       $$(trace-jar) jar cfm $$($(1)_PATH) <(echo -e '$$(subst 
$$(newline),\n,$$($(1)_MANIFEST))') -C $$($(1)_TMPDIR) .
+       @echo -e '$$(subst $$(newline),\n,$$($(1)_MANIFEST))' > 
$$($(1)_PATH).manifest
+       $$(trace-jar) jar cfm $$($(1)_PATH) $$($(1)_PATH).manifest -C 
$$($(1)_TMPDIR) .
+       @rm $$($(1)_PATH).manifest
        @rm -rf $$($(1)_TMPDIR)
 
   $(1)_INSTALL_DIR ?= $$(jardir)
diff --git a/lib.mk b/lib.mk
index fd39d35..f390a7e 100644
--- a/lib.mk
+++ b/lib.mk
@@ -14,10 +14,6 @@ dist-files :=
 OS = $(shell uname -s)
 
 
-# Use bash (required for process substitution in the JAR function).
-SHELL = bash
-
-
 # Hack to define a literal space.
 space :=
 space +=



reply via email to

[Prev in Thread] Current Thread [Next in Thread]