diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-01-27 13:51:40 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:47 +0200 |
| commit | 96e2eeee7492f2fac0ce057776253e117c102c8f (patch) | |
| tree | 5ebbacc85c291e58f2bbb6d00d8f3d337ccd572f /gnu/packages/patches/hurd-add-without-rump-configure-option.patch | |
| parent | 30cacb63f8d01ca667a2d66eb9734c11db26a80c (diff) | |
gnu: hurd: Update to v0.9.git20231217.
* gnu/packages/hurd.scm (hurd-headers): Update to v0.9.git20231217.
[arguments]: Avoid new link test for file_utimens.
* (hurd)[source]: Remove hurd-fix-rumpdisk-build.patch, which has been
included upstream.
* gnu/packages/patches/hurd-add-without-rump-configure-option.patch,
gnu/packages/patches/hurd-fix-rumpdisk-build.patch,
gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch,
gnu/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch:
Remove.
* gnu/local.mk (dist_patch_DATA): Unregister them.
Change-Id: I0b42db19289e2fefeae99b18f0c29a21d3bf67a4
Diffstat (limited to 'gnu/packages/patches/hurd-add-without-rump-configure-option.patch')
| -rw-r--r-- | gnu/packages/patches/hurd-add-without-rump-configure-option.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/gnu/packages/patches/hurd-add-without-rump-configure-option.patch b/gnu/packages/patches/hurd-add-without-rump-configure-option.patch deleted file mode 100644 index 14cefdeac1..0000000000 --- a/gnu/packages/patches/hurd-add-without-rump-configure-option.patch +++ /dev/null @@ -1,82 +0,0 @@ -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 - |