Date: Sat, 2 Feb 2013 21:45:43 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311444 - in head/x11-servers/xorg-server: . files Message-ID: <201302022145.r12LjhKr008826@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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@gmail.com> PR: ports/175776 [1] Submitted by: Tsurutani Naoki <turutani@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302022145.r12LjhKr008826>