all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 54635@debbugs.gnu.org
Cc: Arun Isaac <arunisaac@systemreboot.net>,
	Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#54635] [PATCH 4/5] gnu: atomic-queue: Do not depend on boost when cross-compiling.
Date: Wed, 30 Mar 2022 14:53:12 +0530	[thread overview]
Message-ID: <20220330092313.23584-4-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20220330092313.23584-1-arunisaac@systemreboot.net>

* gnu/packages/cpp.scm (atomic-queue)[arguments]: When cross-compiling, add
do-not-check-for-boost phase and delete the build phase.
[native-inputs]: Do not include boost when cross-compiling.
---
 gnu/packages/cpp.scm | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index eb48902034..649a57b0d5 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1294,6 +1294,21 @@ (define-public atomic-queue
      `(#:configure-flags '("-Dbenchmarks=false")
        #:phases
        (modify-phases %standard-phases
+         ,@(if (%current-target-system)
+               `(;; boost is a test dependency. We don't run tests when
+                 ;; cross-compiling. So, do not check for it.
+                 (add-after 'unpack 'do-not-check-for-boost
+                   (lambda _
+                     (substitute* "meson.build"
+                       (("unit_test_framework =" all)
+                        (string-append "# " all))
+                       ((", unit_test_framework") ""))))
+                 ;; atomic-queue is a header-only library. Excepting the
+                 ;; tests, no building is required. And since we don't run
+                 ;; tests when cross-compiling, delete the build phase
+                 ;; entirely.
+                 (delete 'build))
+               '())
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
@@ -1303,9 +1318,11 @@ (define-public atomic-queue
              (copy-recursively "../source/include/atomic_queue"
                                (string-append (assoc-ref outputs "out")
                                               "/include/atomic_queue")))))))
-     (native-inputs
-      (list boost
-            pkg-config))
+    (native-inputs
+     (cons pkg-config
+           (if (%current-target-system)
+               '()
+               (list boost))))
     (home-page "https://github.com/max0x7ba/atomic_queue")
     (synopsis "C++ lockless queue")
     (description
-- 
2.34.0





  parent reply	other threads:[~2022-03-30  9:34 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-30  9:19 [bug#54635] [PATCH 0/5] Add wfmash Arun Isaac
2022-03-30  9:23 ` [bug#54635] [PATCH 1/5] gnu: gsl: Force bootstrap when cross-compiling to riscv64-linux Arun Isaac
2022-03-30  9:23   ` [bug#54635] [PATCH 2/5] gnu: htslib: Add bzip2 and xz to inputs Arun Isaac
2022-03-30  9:23   ` [bug#54635] [PATCH 3/5] gnu: atomic-queue: Run tests correctly Arun Isaac
2022-03-30  9:23   ` Arun Isaac [this message]
2022-03-30 11:49     ` [bug#54635] [PATCH 4/5] gnu: atomic-queue: Do not depend on boost when cross-compiling Maxime Devos
2022-03-31  7:24       ` Arun Isaac
2022-03-30  9:23   ` [bug#54635] [PATCH 5/5] gnu: Add wfmash Arun Isaac
2022-03-30 11:33   ` [bug#54635] [PATCH 1/5] gnu: gsl: Force bootstrap when cross-compiling to riscv64-linux Maxime Devos
2022-03-31  6:14     ` Arun Isaac
2022-03-30 11:36   ` Maxime Devos
2022-03-30 11:39     ` Efraim Flashner
2022-03-31  6:33       ` Arun Isaac
2022-03-31 11:29         ` Maxime Devos
2022-03-31 12:35         ` Efraim Flashner
2022-03-31  7:28       ` [bug#54635] [PATCH v2 " Arun Isaac
2022-03-31  7:28       ` [bug#54635] [PATCH v2 2/5] gnu: htslib: Add bzip2 and xz to inputs Arun Isaac
2022-03-31  7:28       ` [bug#54635] [PATCH v2 3/5] gnu: atomic-queue: Run tests correctly Arun Isaac
2022-03-31  7:28       ` [bug#54635] [PATCH v2 4/5] gnu: atomic-queue: Do not look for boost when cross-compiling Arun Isaac
2022-03-31  7:28       ` [bug#54635] [PATCH v2 5/5] gnu: Add wfmash Arun Isaac
2022-03-31 11:34         ` Maxime Devos
2022-03-31 12:18           ` Efraim Flashner
2022-03-31 13:07             ` Maxime Devos
2022-03-31 13:09               ` Efraim Flashner
2022-03-31 13:31               ` bug#54635: " Efraim Flashner
2022-04-01  7:40                 ` [bug#54635] " Arun Isaac
2022-04-01  9:39                   ` Maxime Devos
2022-04-04 18:01                     ` Arun Isaac

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=20220330092313.23584-4-arunisaac@systemreboot.net \
    --to=arunisaac@systemreboot.net \
    --cc=54635@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    /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.