Attachment 2047 Details for Bug 1901 – /home/djm/bz1901.diff

[patch] /home/djm/bz1901.diff

bz1901.diff (text/plain), 2.79 KB, created by Damien Miller on 2011-05-20 10:32:48 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2011-05-20 10:32:48 AEST

Size: 2.79 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.473
>diff -u -p -r1.473 configure.ac
>--- configure.ac	5 May 2011 04:44:25 -0000	1.473
>+++ configure.ac	20 May 2011 00:29:29 -0000
>@@ -19,18 +19,6 @@ AC_REVISION($Revision: 1.473 $)
> AC_CONFIG_SRCDIR([ssh.c])
> AC_LANG([C])
> 
>-# local macros
>-AC_DEFUN([OPENSSH_CHECK_CFLAG_COMPILE], [{
>-	AC_MSG_CHECKING([if $CC supports $1])
>-	saved_CFLAGS="$CFLAGS"
>-	CFLAGS="$CFLAGS $1"
>-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])],
>-		[ AC_MSG_RESULT([yes]) ],
>-		[ AC_MSG_RESULT([no])
>-		  CFLAGS="$saved_CFLAGS" ]
>-	)
>-}])
>-
> AC_CONFIG_HEADER([config.h])
> AC_PROG_CC
> AC_CANONICAL_HOST
>@@ -128,14 +116,14 @@ AC_ARG_WITH([stackprotect],
> 
> 
> if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
>-	OPENSSH_CHECK_CFLAG_COMPILE([-Wall])
>-	OPENSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith])
>-	OPENSSH_CHECK_CFLAG_COMPILE([-Wuninitialized])
>-	OPENSSH_CHECK_CFLAG_COMPILE([-Wsign-compare])
>-	OPENSSH_CHECK_CFLAG_COMPILE([-Wformat-security])
>-	OPENSSH_CHECK_CFLAG_COMPILE([-Wno-pointer-sign])
>-	OPENSSH_CHECK_CFLAG_COMPILE([-Wno-unused-result])
>-	OPENSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
>+	OSSH_CHECK_CFLAG_COMPILE([-Wall])
>+	OSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith])
>+	OSSH_CHECK_CFLAG_COMPILE([-Wuninitialized])
>+	OSSH_CHECK_CFLAG_COMPILE([-Wsign-compare])
>+	OSSH_CHECK_CFLAG_COMPILE([-Wformat-security])
>+	OSSH_CHECK_CFLAG_COMPILE([-Wpointer-sign], [-Wno-pointer-sign])
>+	OSSH_CHECK_CFLAG_COMPILE([-Wunused-result], [-Wno-unused-result])
>+	OSSH_CHECK_CFLAG_COMPILE([-fno-strict-aliasing])
> 	AC_MSG_CHECKING([gcc version])
> 	GCC_VER=`$CC -v 2>&1 | $AWK '/gcc version /{print $3}'`
> 	case $GCC_VER in
>Index: aclocal.m4
>===================================================================
>RCS file: /var/cvs/openssh/aclocal.m4,v
>retrieving revision 1.7
>diff -u -p -r1.7 aclocal.m4
>--- aclocal.m4	5 May 2011 03:48:37 -0000	1.7
>+++ aclocal.m4	20 May 2011 00:27:50 -0000
>@@ -3,6 +3,24 @@ dnl
> dnl OpenSSH-specific autoconf macros
> dnl
> 
>+dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag])
>+dnl Check that $CC accepts a flag 'check_flag'. If it is supported append
>+dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
>+dnl 'check_flag'.
>+AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
>+	AC_MSG_CHECKING([if $CC supports $1])
>+	saved_CFLAGS="$CFLAGS"
>+	CFLAGS="$CFLAGS $1"
>+	_define_flag="$2"
>+	test "x$_define_flag" = "x" && _define_flag="$1"
>+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void main(void) { return 0; }]])],
>+		[ AC_MSG_RESULT([yes])
>+		  CFLAGS="$saved_CFLAGS $_define_flag"],
>+		[ AC_MSG_RESULT([no])
>+		  CFLAGS="$saved_CFLAGS" ]
>+	)
>+}])
>+
> 
> dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
> dnl Does AC_EGREP_HEADER on 'header' for the string 'field'

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1901: 2047