From 80bc1678b7b859decae536e726a3e5870cbe84eb Mon Sep 17 00:00:00 2001
Message-Id: <80bc1678b7b859decae536e726a3e5870cbe84eb.1678657122.git.dev@jpoiret.xyz>
In-Reply-To: <c9b816085272dd07ed762c5ae775a994fa77df56.1678657122.git.dev@jpoiret.xyz>
References: <c9b816085272dd07ed762c5ae775a994fa77df56.1678657122.git.dev@jpoiret.xyz>
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Mon, 31 Oct 2022 13:39:28 +0100
Subject: [PATCH 2/2] Add --without-rump configure option

From: Samuel Thibault <samuel.thibault@ens-lyon.org>

To allow cross-builds which cannot use AC_LINK_IFELSE at all.
---
 configure.ac | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0c1bf9b2..849b5fad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,33 +234,38 @@ AS_IF([test "x$with_libz" != xno], [
 ])
 AC_SUBST([HAVE_LIBZ])
 
-# Save
-oldLIBS="$LIBS"
+AC_ARG_WITH([rump],
+  [AS_HELP_STRING([--without-rump], [disable rump])], , [with_rump=yes])
 
-LIBS="$oldLIBS -lrump"
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM(
-    [[#include <hurd.h>
+AS_IF([test "x$with_rump" != xno], [
+  # Save
+  oldLIBS="$LIBS"
+
+  LIBS="$oldLIBS -lrump"
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+      [[#include <hurd.h>
 #define _STANDALONE
 #include <rump/rump.h>]],
-  [])],
-  [HAVE_LIBRUMP=yes],
-  [HAVE_LIBRUMP=no])
-AC_SUBST([HAVE_LIBRUMP])
-
-LIBS="$oldLIBS -lrumpvfs_nofifofs_pic"
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM(
-    [[#include <hurd.h>
+    [])],
+    [HAVE_LIBRUMP=yes],
+    [HAVE_LIBRUMP=no])
+  AC_SUBST([HAVE_LIBRUMP])
+
+  LIBS="$oldLIBS -lrumpvfs_nofifofs_pic"
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+      [[#include <hurd.h>
 #define _STANDALONE
 #include <rump/rump.h>]],
-  [])],
-  [HAVE_LIBRUMP_VFSNOFIFO=yes],
-  [HAVE_LIBRUMP_VFSNOFIFO=no])
-AC_SUBST([HAVE_LIBRUMP_VFSNOFIFO])
+    [])],
+    [HAVE_LIBRUMP_VFSNOFIFO=yes],
+    [HAVE_LIBRUMP_VFSNOFIFO=no])
+  AC_SUBST([HAVE_LIBRUMP_VFSNOFIFO])
 
-# Reset
-LIBS="$oldLIBS"
+  # Reset
+  LIBS="$oldLIBS"
+])
 
 AC_ARG_ENABLE(boot-store-types,
 [  --enable-boot-store-types=TYPES...
-- 
2.39.1

acd8604b59aa434e944c73aecefd5183d13e'>gnu</a>/<a href='/guix/log/gnu/services?id=51deacd8604b59aa434e944c73aecefd5183d13e'>services</a>/<a href='/guix/log/gnu/services/telephony.scm?id=51deacd8604b59aa434e944c73aecefd5183d13e'>telephony.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/telephony.scm?id=51deacd8604b59aa434e944c73aecefd5183d13e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-02-08 09:36:26 -0500'>2023-02-08</span></td><td><a href='/guix/commit/gnu/services/telephony.scm?id=aef75942fc24fdb753978848b5471c5da21f23b7'>gnu: libjami: Move jamid daemon to a "bin" output.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/jami.scm (libjami) [outputs]: Add a "bin" output.
[arguments]: Add a move-jamid phase.
* gnu/services/telephony.scm
(jami-configuration-&gt;command-line-arguments): Refer to the "bin" output of
libjami.
(jami-shepherd-services): Likewise.
</span></span></td><td>Maxim Cournoyer</td></tr>
aw my-pine.scm

returns:

guix system: error: package linux-libre-arm64-generic@5.18.19 does not support
x86_64-linux

That's because there's no platform defined in the pine64-raw image-type, hence
the guix system image tries to build the image for the host architecture.

* gnu/system/images/novena.scm (novena-image-type): Use the armv7-linux platform.
* gnu/system/images/pine64.scm (pine64-image-type): Use the aarch64-linux platform.
* gnu/system/images/pinebook-pro.scm (pinebook-pro-image-type): Use the aarch64-linux platform.
* gnu/system/images/rock64.scm (rock64-image-type): Use the aarch64-linux platform.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2022-05-25 09:27:25 +0200'>2022-05-25</span></td><td><a href='/guix/commit/gnu/system/images/pinebook-pro.scm?id=dab819d5c4c55609efae098c8e3c2f2757c34e5b'>Move (gnu platform) and (gnu platforms ...) to guix/.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/platform.scm:
* gnu/platforms/arm.scm:
* gnu/platforms/hurd.scm:
* gnu/platforms/mips.scm:
* gnu/platforms/powerpc.scm:
* gnu/platforms/riscv.scm:
* gnu/platforms/s390.scm:
* gnu/platforms/x86.scm: Move to guix/.

* Makefile.am:
* doc/guix.texi (Porting to a New Platform):
* etc/release-manifest.scm:
* gnu/ci.scm:
* gnu/image.scm:
* gnu/local.mk:
* gnu/packages/bioinformatics.scm:
* gnu/packages/bootstrap.scm:
* gnu/packages/cross-base.scm:
* gnu/packages/instrumentation.scm:
* gnu/packages/linux.scm:
* gnu/system/image.scm:
* gnu/system/images/hurd.scm:
* gnu/system/images/novena.scm:
* gnu/system/images/pine64.scm:
* gnu/system/images/pinebook-pro.scm:
* gnu/system/images/rock64.scm:
* guix/scripts/build.scm:
* guix/scripts/system.scm:
* guix/self.scm: Update (gnu platform...) to (guix platform...).

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Josselin Poiret</td></tr>