[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#29745] [PATCH 3/3] gnu: Return #t from phases.
|
From: |
Arun Isaac |
|
Subject: |
[bug#29745] [PATCH 3/3] gnu: Return #t from phases. |
|
Date: |
Sun, 17 Dec 2017 04:46:17 +0530 |
* gnu/packages/attr.scm (attr): Return #t from phases.
* gnu/packages/autotools.scm (libltdl): Return #t from phases.
* gnu/packages/base.scm (coreutils): Return #t from phases.
* gnu/packages/bash.scm (bash): Return #t from phases.
* gnu/packages/commencement.scm (gnu-make-boot0, gcc-boot0, gettext-boot0,
libstdc++): Return #t from phases.
* gnu/packages/gcc.scm (make-libstdc++): Return #t from phases.
* gnu/packages/libffi.scm (libffi): Return #t from phases.
* gnu/packages/m4.scm (m4): Return #t from phases.
* gnu/packages/ncurses.scm (ncurses): Return #t from phases.
* gnu/packages/perl.scm (perl): Return #t from phases.
* gnu/packages/readline.scm (readline): Return #t from phases.
---
gnu/packages/attr.scm | 3 ++-
gnu/packages/autotools.scm | 3 ++-
gnu/packages/base.scm | 3 ++-
gnu/packages/bash.scm | 3 ++-
gnu/packages/commencement.scm | 15 ++++++++++-----
gnu/packages/gcc.scm | 3 ++-
gnu/packages/libffi.scm | 3 ++-
gnu/packages/m4.scm | 3 ++-
gnu/packages/ncurses.scm | 6 ++++--
gnu/packages/perl.scm | 3 ++-
gnu/packages/readline.scm | 3 ++-
11 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm
index 4dbe09cec..7928c562b 100644
--- a/gnu/packages/attr.scm
+++ b/gnu/packages/attr.scm
@@ -42,7 +42,8 @@
(modify-phases %standard-phases
(add-after 'configure 'patch-makefile-SHELL
(lambda _
- (patch-makefile-SHELL "include/buildmacros")))
+ (patch-makefile-SHELL "include/buildmacros")
+ #t))
(replace 'install
(lambda _
(zero? (system* "make"
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 8a906a7d4..7454158bb 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -413,7 +413,8 @@ complexity of working with shared libraries across
platforms.")
#:phases (alist-cons-before
'configure 'change-directory
(lambda _
- (chdir "libltdl"))
+ (chdir "libltdl")
+ #t)
%standard-phases)))
(synopsis "System-independent dlopen wrapper of GNU libtool")
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 9cb628d8d..ddb9a5756 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -335,7 +335,8 @@ used to apply commands with arbitrarily long arguments.")
(format #f "~a/bin/sh" bash)))
(substitute* (find-files "tests" "\\.sh$")
(("#!/bin/sh")
- (format #f "#!~a/bin/sh" bash)))))
+ (format #f "#!~a/bin/sh" bash))))
+ #t)
%standard-phases)))
(synopsis "Core GNU utilities (file, text, shell)")
(description
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index b8b0ae58f..c50b4e693 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -159,7 +159,8 @@ number/base32-hash tuples, directly usable in the
'patch-series' form."
;; Add a `sh' -> `bash' link.
(let ((out (assoc-ref outputs "out")))
(with-directory-excursion (string-append out "/bin")
- (symlink "bash" "sh")))))
+ (symlink "bash" "sh")))
+ #t))
(add-after 'install 'move-development-files
(lambda* (#:key outputs #:allow-other-keys)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c5c00688e..ae845f2e7 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -85,7 +85,8 @@
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
- (install-file "make" bin)))))))))
+ (install-file "make" bin))
+ #t)))))))
(native-inputs '()) ; no need for 'pkg-config'
(inputs %bootstrap-inputs))))
@@ -260,7 +261,8 @@
(package-full-name lib)
char-set:letter)
,(package-name lib)))
- (list gmp-6.0 mpfr mpc))))
+ (list gmp-6.0 mpfr mpc)))
+ #t)
(alist-cons-after
'install 'symlink-libgcc_eh
(lambda* (#:key outputs #:allow-other-keys)
@@ -271,7 +273,8 @@
(string-append out "/lib/gcc/"
,(boot-triplet)
"/" ,(package-version gcc))
- (symlink "libgcc.a" "libgcc_eh.a"))))
+ (symlink "libgcc.a" "libgcc_eh.a")))
+ #t)
,phases))))))
(inputs `(("gmp-source" ,(package-source gmp-6.0))
@@ -612,7 +615,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"address@hidden"~%"
;; Build only the tools.
(add-after 'unpack 'chdir
(lambda _
- (chdir "gettext-tools")))
+ (chdir "gettext-tools")
+ #t))
;; Some test programs require pthreads, which we don't have.
(add-before 'configure 'no-test-programs
@@ -692,7 +696,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"address@hidden"~%"
#:phases (alist-cons-before
'configure 'chdir
(lambda _
- (chdir "libstdc++-v3"))
+ (chdir "libstdc++-v3")
+ #t)
%standard-phases)
#:configure-flags `("--disable-shared"
"--disable-libstdcxx-threads"
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index ad8992289..0151784e8 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -449,7 +449,8 @@ using compilers other than GCC."
#:phases (alist-cons-before
'configure 'chdir
(lambda _
- (chdir "libstdc++-v3"))
+ (chdir "libstdc++-v3")
+ #t)
%standard-phases)
#:configure-flags `("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index 948dabb41..ed7628dc3 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -41,7 +41,8 @@
'(lambda* (#:key outputs #:allow-other-keys)
(define out (assoc-ref outputs "out"))
(symlink (string-append out "/lib/libffi-3.2.1/include")
- (string-append out "/include")))))
+ (string-append out "/include"))
+ #t)))
(package
(name "libffi")
(version "3.2.1")
diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm
index 32e7c2ae4..1162e0bb8 100644
--- a/gnu/packages/m4.scm
+++ b/gnu/packages/m4.scm
@@ -50,7 +50,8 @@
(substitute* (find-files "tests"
"posix_spawn")
(("/bin/sh")
- (format #f "~a/bin/sh" bash)))))
+ (format #f "~a/bin/sh" bash))))
+ #t)
%standard-phases)))
(synopsis "Macro processor")
(description
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 9f5905bc8..9aecc363b 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -54,7 +54,8 @@
(let ((patch-makefile-phase
'(lambda _
(for-each patch-makefile-SHELL
- (find-files "." "Makefile.in"))))
+ (find-files "." "Makefile.in"))
+ #t))
(configure-phase
;; The 'configure' script does not understand '--docdir', so we
must
;; override that and use '--mandir' instead.
@@ -141,7 +142,8 @@
(when (file-exists? packagew.pc)
(symlink packagew.pc
package.pc))))
'())))
- '("curses" "ncurses" "form" "panel" "menu")))))))
+ '("curses" "ncurses" "form" "panel" "menu"))))
+ #t)))
`(#:configure-flags
,(cons*
'quasiquote
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 7ff55546c..662fb90d2 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -114,7 +114,8 @@
(lib (string-append out "/lib")))
(for-each (lambda (dso)
(chmod dso #o755))
- (find-files lib "\\.so$")))))
+ (find-files lib "\\.so$")))
+ #t))
(add-after 'install 'remove-extra-references
(lambda* (#:key inputs outputs #:allow-other-keys)
diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm
index f6ebbcc26..897657aa1 100644
--- a/gnu/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -39,7 +39,8 @@
(for-each (lambda (f) (chmod f #o755))
(find-files lib "\\.so"))
(for-each (lambda (f) (chmod f #o644))
- (find-files lib "\\.a"))))))
+ (find-files lib "\\.a")))
+ #t)))
(package
(name "readline")
(version "7.0")
--
2.15.1
- [bug#29745] [PATCH 0/3] Disallow phase returning <unspecified>., Arun Isaac, 2017/12/16
- [bug#29745] [PATCH 1/3] build: gnu-build-system: Disallow phase returning <unspecified>., Arun Isaac, 2017/12/16
- [bug#29745] [PATCH 0/3] Disallow phase returning <unspecified>., Ricardo Wurmus, 2017/12/17
- [bug#29745] [PATCH 0/3] Disallow phase returning <unspecified>., Ludovic Courtès, 2017/12/17
- [bug#29745] [PATCH 0/3] Disallow phase returning <unspecified>., Andreas Enge, 2017/12/18
- [bug#29745] [PATCH 0/3] Disallow phase returning <unspecified>., Ricardo Wurmus, 2017/12/19