From 08fbfa8d21674738cf043bf4cc6fba1a91fc3162 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 14 Apr 2016 21:01:09 -0400 Subject: Revert "gnu: btrfs-progs: Add "static" output." This reverts commit 5f3f3ac287467994f01646680c6a6837ec7ee587. --- gnu/packages/linux.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 310bb57127..e1a12045df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2495,26 +2495,12 @@ and copy/paste text in the console and in xterm.") (base32 "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f")))) (build-system gnu-build-system) - (outputs '("out" - "static")) ; static versions of binaries in "out" (~16MiB!) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'build 'build-static - (lambda _ (zero? (system* "make" "static")))) - (add-after 'install 'install-static - (let ((staticbin (string-append (assoc-ref %outputs "static") - "/bin"))) - (lambda _ - (zero? (system* "make" - (string-append "bindir=" staticbin) - "install-static")))))) - #:test-target "test" + '(#:test-target "test" #:parallel-tests? #f)) ; tests fail when run in parallel (inputs `(("e2fsprogs" ,e2fsprogs) ("libblkid" ,util-linux) - ("libblkid:static" ,util-linux "static") ("libuuid" ,util-linux) - ("libuuid:static" ,util-linux "static") ("zlib" ,zlib) ("lzo" ,lzo))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1