From owner-svn-ports-head@FreeBSD.ORG Sat Jan 19 12:35:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A217861D; Sat, 19 Jan 2013 12:35:41 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7A74B99A; Sat, 19 Jan 2013 12:35:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0JCZflI034114; Sat, 19 Jan 2013 12:35:41 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0JCZelE034110; Sat, 19 Jan 2013 12:35:40 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201301191235.r0JCZelE034110@svn.freebsd.org> From: Niclas Zeising Date: Sat, 19 Jan 2013 12:35:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310652 - in head/x11-servers/xorg-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2013 12:35:41 -0000 Author: zeising Date: Sat Jan 19 12:35:40 2013 New Revision: 310652 URL: http://svnweb.freebsd.org/changeset/ports/310652 Log: Fix build on i386 when building with clang. PR: ports/174286 (inspired by) Submitted by: deeptech71 Tested by: crees, kwm Approved by: kwm, miwi (mentors, implicit) Obtained from: xorg-dev repo Added: head/x11-servers/xorg-server/files/extra-new-arch-i386 (contents, props changed) head/x11-servers/xorg-server/files/extra-old-arch-i386 (contents, props changed) Modified: head/x11-servers/xorg-server/Makefile Modified: head/x11-servers/xorg-server/Makefile ============================================================================== --- head/x11-servers/xorg-server/Makefile Sat Jan 19 10:21:10 2013 (r310651) +++ head/x11-servers/xorg-server/Makefile Sat Jan 19 12:35:40 2013 (r310652) @@ -113,6 +113,14 @@ CONFIGURE_ARGS+=--enable-install-setuid= CONFIGURE_ARGS+=--enable-install-setuid=no .endif +.if ${ARCH} == i386 +.if defined(WITH_NEW_XORG) +EXTRA_PATCHES+= ${FILESDIR}/extra-new-arch-i386 +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-i386 +.endif +.endif + .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64 Added: head/x11-servers/xorg-server/files/extra-new-arch-i386 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/extra-new-arch-i386 Sat Jan 19 12:35:40 2013 (r310652) @@ -0,0 +1,11 @@ +--- hw/xfree86/common/compiler.h.orig 2012-05-17 19:09:03.000000000 +0200 ++++ hw/xfree86/common/compiler.h 2013-01-18 13:59:18.366436857 +0100 +@@ -1335,7 +1335,7 @@ + + #if !defined(__SUNPRO_C) + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) +-#ifdef GCCUSESGAS ++#if defined(GCCUSESGAS) || defined(__clang__) + + /* + * If gcc uses gas rather than the native assembler, the syntax of these Added: head/x11-servers/xorg-server/files/extra-old-arch-i386 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/extra-old-arch-i386 Sat Jan 19 12:35:40 2013 (r310652) @@ -0,0 +1,11 @@ +--- hw/xfree86/common/compiler.h.orig 2010-05-04 02:47:58.000000000 +0200 ++++ hw/xfree86/common/compiler.h 2013-01-18 13:07:35.785442739 +0100 +@@ -1021,7 +1021,7 @@ + + # if !defined(__SUNPRO_C) + # if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) +-# ifdef GCCUSESGAS ++# if defined(GCCUSESGAS) || defined(__clang__) + + /* + * If gcc uses gas rather than the native assembler, the syntax of these