ports/175776: commit references a PR
dfilter service
dfilter at FreeBSD.ORG
Sat Feb 2 21:50:01 UTC 2013
The following reply was made to PR ports/175776; it has been noted by GNATS.
From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/175776: commit references a PR
Date: Sat, 2 Feb 2013 21:45:52 +0000 (UTC)
Author: zeising
Date: Sat Feb 2 21:45:42 2013
New Revision: 311444
URL: http://svnweb.freebsd.org/changeset/ports/311444
Log:
Fix the patch used to make xorg-server build with clang on i386.
Noticed by: Barbara Guida <barbara.freebsd at gmail.com>
PR: ports/175776 [1]
Submitted by: Tsurutani Naoki <turutani at scphys.kyoto-u.ac.jp> [1]
Approved by: kwm, miwi (mentors, implicit)
Added:
head/x11-servers/xorg-server/files/extra-arch-i386
- copied unchanged from r311425, head/x11-servers/xorg-server/files/extra-old-arch-i386
Deleted:
head/x11-servers/xorg-server/files/extra-new-arch-i386
head/x11-servers/xorg-server/files/extra-old-arch-i386
Modified:
head/x11-servers/xorg-server/Makefile
Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile Sat Feb 2 20:35:48 2013 (r311443)
+++ head/x11-servers/xorg-server/Makefile Sat Feb 2 21:45:42 2013 (r311444)
@@ -114,11 +114,7 @@ CONFIGURE_ARGS+=--enable-install-setuid=
.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
+EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386
.endif
.if ${ARCH} == ia64
Copied: head/x11-servers/xorg-server/files/extra-arch-i386 (from r311425, 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-arch-i386 Sat Feb 2 21:45:42 2013 (r311444, copy of r311425, head/x11-servers/xorg-server/files/extra-old-arch-i386)
@@ -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"
More information about the freebsd-x11
mailing list