[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: bitshuffle-for-snappy: Simplify.
From: |
Ricardo Wurmus |
Subject: |
02/02: gnu: bitshuffle-for-snappy: Simplify. |
Date: |
Sat, 18 Nov 2017 06:57:08 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit 04e91134af768059f8bcc8f28a9e61d40d03bf43
Author: Ricardo Wurmus <address@hidden>
Date: Sat Nov 18 12:56:35 2017 +0100
gnu: bitshuffle-for-snappy: Simplify.
* gnu/packages/compression.scm (bitshuffle-for-snappy)[arguments]: Simplify
Makefile generation.
---
gnu/packages/compression.scm | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index c86bc1f..748c75a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1098,26 +1098,27 @@ for most inputs, but the resulting compressed files are
anywhere from 20% to
(lambda* (#:key outputs #:allow-other-keys)
(with-output-to-file "Makefile"
(lambda _
- (display
- (string-append
- "libbitshuffle.so: src/bitshuffle.o src/bitshuffle_core.o
"
- "src/iochain.o lz4/lz4.o\n"
- "\tgcc -O3 -ffast-math -std=c99 -o $@ -shared -fPIC $^\n"
- "\n"
- "%.o: %.c\n"
- "\tgcc -O3 -ffast-math -std=c99 -fPIC -Isrc -Ilz4 -c $<
-o address@hidden"
- "\n"
- "PREFIX:=" (assoc-ref outputs "out") "\n"
- "LIBDIR:=$(PREFIX)/lib\n"
- "INCLUDEDIR:=$(PREFIX)/include\n"
- "install: libbitshuffle.so\n"
- "\tinstall -dm755 $(LIBDIR)\n"
- "\tinstall -dm755 $(INCLUDEDIR)\n"
- "\tinstall -m755 libbitshuffle.so $(LIBDIR)\n"
- "\tinstall -m644 src/bitshuffle.h $(INCLUDEDIR)\n"
- "\tinstall -m644 src/bitshuffle_core.h $(INCLUDEDIR)\n"
- "\tinstall -m644 src/iochain.h $(INCLUDEDIR)\n"
- "\tinstall -m644 lz4/lz4.h $(INCLUDEDIR)\n")))))))))
+ (format #t "\
+libbitshuffle.so: src/bitshuffle.o src/bitshuffle_core.o src/iochain.o
lz4/lz4.o
+\tgcc -O3 -ffast-math -std=c99 -o $@ -shared -fPIC $^
+
+%.o: %.c
+\tgcc -O3 -ffast-math -std=c99 -fPIC -Isrc -Ilz4 -c $< -o $@
+
+PREFIX:=~a
+LIBDIR:=$(PREFIX)/lib
+INCLUDEDIR:=$(PREFIX)/include
+
+install: libbitshuffle.so
+\tinstall -dm755 $(LIBDIR)
+\tinstall -dm755 $(INCLUDEDIR)
+\tinstall -m755 libbitshuffle.so $(LIBDIR)
+\tinstall -m644 src/bitshuffle.h $(INCLUDEDIR)
+\tinstall -m644 src/bitshuffle_core.h $(INCLUDEDIR)
+\tinstall -m644 src/iochain.h $(INCLUDEDIR)
+\tinstall -m644 lz4/lz4.h $(INCLUDEDIR)
+" (assoc-ref outputs "out"))))
+ #t)))))
(inputs '())
(native-inputs '())))