Bug#671044: freedink: FTBFS[!linux]: too many args to install-reloc
Sylvain
beuc at gnu.org
Wed May 2 11:50:35 UTC 2012
Hi,
On Wed, May 02, 2012 at 02:49:33AM +0200, Bruno Haible wrote:
> I'm applying this patch. Please let me know if this fixes the Freedink
> builds on GNU/kFreeBSD or not.
>
>
> 2012-05-01 Bruno Haible <bruno at clisp.org>
>
> 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 <steven at pyro.eu.org>.
>
> --- build-aux/reloc-ldflags.orig Wed May 2 02:43:45 2012
> +++ build-aux/reloc-ldflags Wed May 2 02:41:45 2012
> @@ -54,7 +54,7 @@
> 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
> --- m4/relocatable.m4.orig Wed May 2 02:43:45 2012
> +++ m4/relocatable.m4 Wed May 2 02:42:57 2012
> @@ -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_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=:
The fix seems to have the expected result (install-reloc not invoked) under kFreeBSD:
make[4]: entrant dans le répertoire « /usr/src/freedink-1.08.20120427/src »
test -z "/usr/games" || /bin/mkdir -p "/usr/src/freedink-1.08.20120427/debian/freedink-engine/usr/games"
/usr/bin/install -c freedink freedinkedit '/usr/src/freedink-1.08.20120427/debian/freedink-engine/usr/games'
Though, I'm wondering if it would be better to always invoke
install-reloc somehow. We'd probably have spotted this issue earlier
if install-reloc were invoked under GNU/Linux as well. WDYT?
--
Sylvain
More information about the Pkg-games-devel
mailing list