ports/174286: commit references a PR

[dfilter service]

The following reply was made to PR ports/174286; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/174286: commit references a PR
Date: Sat, 19 Jan 2013 12:35:54 +0000 (UTC)

 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 <deeptech71 at gmail.com>
   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
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"