From ca15ce84856b022a8948e59bd001f17ac71bcf01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Tue, 19 Feb 2013 15:30:34 +0100 Subject: [PATCH 1/2] build/autoconf: fix check for GNU ld version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit we need to look for the version once in the stdout and once in the stderr output. Some version of ld output to stdout, some output to stderr. redirecting stderr to stdout messes the output up in our case, that's why we have to do two runs. See also bug #7825. Signed-off-by: Bjoern Jacke Reviewed-by: Stefan Metzmacher Autobuild-User(master): Björn Jacke Autobuild-Date(master): Tue Feb 19 20:56:12 CET 2013 on sn-devel-104 (cherry picked from commit ff8ba0628f6f13a5be1df94e5ac2e83008b7c69c) --- source3/configure.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source3/configure.in b/source3/configure.in index a4e0763..36cfa4a 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -227,7 +227,11 @@ dnl Certain versions of GNU ld the default is not to have the dnl --allow-shlib-undefined flag defined. This causes a stackload of dnl warnings when building modules. if test "$ac_cv_prog_gnu_ld" = "yes"; then - ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 < /dev/null | grep "GNU ld"` + ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"` + # we need to make a 2nd (separate!) check on the output of stderr, see bug #7825: + if test -z ${ac_cv_gnu_ld_version} ; then + ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"` + fi AC_MSG_CHECKING(GNU ld release date) changequote(,)dnl ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'` -- 1.8.0