From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 27 02:57:50 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C55E51065670;
	Thu, 27 Sep 2012 02:57:50 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B0AD38FC16;
	Thu, 27 Sep 2012 02:57:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8R2vo33039337;
	Thu, 27 Sep 2012 02:57:50 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R2voKb039335;
	Thu, 27 Sep 2012 02:57:50 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201209270257.q8R2voKb039335@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Thu, 27 Sep 2012 02:57:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304944 - head/security/sudo
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Sep 2012 02:57:50 -0000

Author: wxs
Date: Thu Sep 27 02:57:50 2012
New Revision: 304944
URL: http://svn.freebsd.org/changeset/ports/304944

Log:
  Fix build on i386 by disabling hardening measures. This is a temporary
  fix until I can figure out what is really going on.

Modified:
  head/security/sudo/Makefile

Modified: head/security/sudo/Makefile
==============================================================================
--- head/security/sudo/Makefile	Thu Sep 27 02:48:53 2012	(r304943)
+++ head/security/sudo/Makefile	Thu Sep 27 02:57:50 2012	(r304944)
@@ -20,7 +20,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+= -lgcc
+LDFLAGS+=	-lgcc
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-ignore-dot \
@@ -99,6 +99,14 @@ CONFIGURE_ARGS+=--with-bsm-audit
 CONFIGURE_ARGS+=--with-opie
 .endif
 
+.include <bsd.port.pre.mk>
+
+# Temporary workaround until I can figure out why the build fails on i386.
+# You can add --stack-protector to LDFLAGS but that doesn't work with clang.
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=	--disable-hardening
+.endif
+
 MAN5+=		sudoers.5
 MAN8=		sudo.8 visudo.8 sudoreplay.8 sudo_plugin.8
 MLINKS=		sudo.8 sudoedit.8
@@ -126,4 +134,4 @@ post-install:
 	fi
 	${TOUCH} ${PREFIX}/etc/sudoers.d/.keep-me
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>