From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 67332@debbugs.gnu.org
Subject: [bug#67332] [PATCH] gnu: ephemeralpg: Fix cross-compilation.
Date: Tue, 21 Nov 2023 23:45:06 +0800 [thread overview]
Message-ID: <b6721616b6d6d95a595d986cab67d855b217b927.1700581506.git.zhengjunjie@iscas.ac.cn> (raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 3031 bytes --]
* gnu/packages/databases.scm (ephemeralpg): Fix cross-compilation.
[arguments]: Use Gexp, remove tailed #t.
[inputs]: Add bash-minimal.
Change-Id: Icdb3dc2db120b07f0d4f03a94a693459974ae06f
---
gnu/packages/databases.scm | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f0ea100c3b..c5e493440e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -62,6 +62,7 @@
;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne
;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -202,26 +203,25 @@ (define-public ephemeralpg
(base32 "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags (list (string-append "CC=" ,(cc-for-target))
- (string-append "PREFIX=" %output))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/pg_tmp")
- `("PATH" ":" prefix
- (,(string-append (assoc-ref inputs "util-linux")
- "/bin")
- ,(string-append (assoc-ref inputs "postgresql")
- "/bin")
- ;; For getsocket.
- ,(string-append out "/bin")))))
- #t)))
- #:test-target "test"))
+ (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (add-after 'install 'wrap
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/pg_tmp")
+ `("PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "util-linux")
+ "/bin")
+ ,(string-append (assoc-ref inputs "postgresql")
+ "/bin")
+ ;; For getsocket.
+ ,(string-append out "/bin"))))))))
+ #:test-target "test"))
(inputs
- (list postgresql util-linux))
+ (list bash-minimal postgresql util-linux))
(native-inputs
;; For tests.
(list ruby which))
base-commit: d20ece07dbb09382f361c8bbf0bcab9e83d8b73e
--
2.41.0
next reply other threads:[~2023-11-21 15:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 15:45 Zheng Junjie [this message]
2023-11-21 17:21 ` [bug#67332] gnu: ephemeralpg: Fix cross-compilation Maxime Devos
2023-11-21 22:42 ` Maxime Devos
2023-11-23 12:02 ` bug#67332: what is the status of the core-updates now Z572 via Guix-patches via
2023-11-23 12:02 ` Z572 via Guix-patches via
2023-11-28 1:59 ` [bug#67332] " Maxime Devos
2023-12-04 1:21 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b6721616b6d6d95a595d986cab67d855b217b927.1700581506.git.zhengjunjie@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=67332@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.