# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1550953454 -3600
# Node ID cd38408f509acaba7fc7358fa8d4b034fa1e47a2
# Parent  45dce2bf6e8aeec9f5ee2d3feffac23b27e76a8c
relocatable-prog: Use $ORIGIN trick also on GNU/Hurd.

* m4/relocatable.m4 (gl_RELOCATABLE_BODY): Use $ORIGIN trick also on
Hurd with glibc >= 2.27.

diff -r 45dce2bf6e8a -r cd38408f509a ChangeLog
--- a/ChangeLog	Thu Feb 21 20:07:21 2019 -0800
+++ b/ChangeLog	Sat Feb 23 21:24:14 2019 +0100
@@ -1,3 +1,9 @@
+2019-02-23  Bruno Haible  <bruno@clisp.org>
+
+	relocatable-prog: Use $ORIGIN trick also on GNU/Hurd.
+	* m4/relocatable.m4 (gl_RELOCATABLE_BODY): Use $ORIGIN trick also on
+	Hurd with glibc >= 2.27.
+
 2019-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
 	nstrftime: merge glibc strftime changes
diff -r 45dce2bf6e8a -r cd38408f509a m4/relocatable.m4
--- a/m4/relocatable.m4	Thu Feb 21 20:07:21 2019 -0800
+++ b/m4/relocatable.m4	Sat Feb 23 21:24:14 2019 +0100
@@ -1,4 +1,4 @@
-# relocatable.m4 serial 20
+# relocatable.m4 serial 21
 dnl Copyright (C) 2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -40,16 +40,24 @@
     enable_rpath=no
     AC_CHECK_HEADERS([mach-o/dyld.h])
     AC_CHECK_FUNCS([_NSGetExecutablePath])
-changequote(,)dnl
     case "$host_os" in
       mingw*) is_noop=yes ;;
       # For the platforms that support $ORIGIN, see
       # <https://lekensteyn.nl/rpath.html>.
       # glibc systems, Linux with musl libc: yes. Android: no.
-      # Hurd: no <http://lists.gnu.org/archive/html/bug-hurd/2019-02/msg00049.html>.
       linux*-android*) ;;
-      gnu*) ;;
       linux* | kfreebsd*) use_elf_origin_trick=yes ;;
+      # Hurd: <http://lists.gnu.org/archive/html/bug-hurd/2019-02/msg00049.html>
+      # only after the glibc commit from 2018-01-08
+      # <https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=311ba8dc4416467947eff2ab327854f124226309>
+      gnu*)
+        # Test for a glibc version >= 2.27.
+        AC_CHECK_FUNCS([copy_file_range])
+        if test $ac_cv_func_copy_file_range = yes; then
+          use_elf_origin_trick=yes
+        fi
+        ;;
+changequote(,)dnl
       # FreeBSD >= 7.3, DragonFly >= 3.0: yes.
       freebsd | freebsd[1-7] | freebsd[1-6].* | freebsd7.[0-2]) ;;
       dragonfly | dragonfly[1-2] | dragonfly[1-2].*) ;;
@@ -66,8 +74,8 @@
       solaris*) use_elf_origin_trick=yes ;;
       # Haiku: yes.
       haiku*) use_elf_origin_trick=yes ;;
+changequote([,])dnl
     esac
-changequote([,])dnl
     if test $is_noop = yes; then
       RELOCATABLE_LDFLAGS=:
       AC_SUBST([RELOCATABLE_LDFLAGS])