From 55eaec3f3f92fade41b719aa7cbb7e4e40b8314e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 2 May 2012 02:49:49 +0200 Subject: [PATCH] relocatable-prog: Enable ELF ORIGIN trick also on GNU/kFreeBSD. * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Treat kFreeBSD like Linux. * build-aux/reloc-ldflags: Likewise. Suggested by Steven Chamberlain . --- ChangeLog | 7 +++++++ build-aux/reloc-ldflags | 2 +- m4/relocatable.m4 | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31f6addd8..55dbe1e52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-05-01 Bruno Haible + relocatable-prog: Enable ELF ORIGIN trick also on GNU/kFreeBSD. + * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Treat kFreeBSD like Linux. + * build-aux/reloc-ldflags: Likewise. + Suggested by Steven Chamberlain . + +2012-05-01 Bruno Haible + gnulib-tool: Remove transitional code. * gnulib-tool: Don't warn about --import with 0 arguments any more. Reported by Dmitriy Selyutin . diff --git a/build-aux/reloc-ldflags b/build-aux/reloc-ldflags index 462ea61bc..873b58568 100755 --- a/build-aux/reloc-ldflags +++ b/build-aux/reloc-ldflags @@ -54,7 +54,7 @@ case "$installdir" in esac case "$host_os" in - linux*) # Supported since Linux 2.1 and glibc 2.1. + linux* | kfreebsd*) rpath= save_IFS="$IFS"; IFS=":" for dir in $library_path_value; do diff --git a/m4/relocatable.m4 b/m4/relocatable.m4 index 2a3c9203d..7901c0c69 100644 --- a/m4/relocatable.m4 +++ b/m4/relocatable.m4 @@ -1,4 +1,4 @@ -# relocatable.m4 serial 17 +# relocatable.m4 serial 18 dnl Copyright (C) 2003, 2005-2007, 2009-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -41,7 +41,7 @@ AC_DEFUN([gl_RELOCATABLE_BODY], AC_CHECK_FUNCS([_NSGetExecutablePath]) case "$host_os" in mingw*) is_noop=yes ;; - linux*) use_elf_origin_trick=yes ;; + linux* | kfreebsd*) use_elf_origin_trick=yes ;; esac if test $is_noop = yes; then RELOCATABLE_LDFLAGS=: -- 2.11.0