kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the patch used to make xorg-server build with clang on i386.

Browse source 
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)
This commit is contained in:
Niclas Zeising 2013-02-02 21:45:42 +00:00
parent b788fc6a12
commit 83d33b71ca
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=311444
3 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
x11-servers/xorg-server/Makefile
View file

@ -114,11 +114,7 @@ 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
EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386
.endif
.if ${ARCH} == ia64

0
x11-servers/xorg-server/files/extra-old-arch-i386 → x11-servers/xorg-server/files/extra-arch-i386
View file

11
x11-servers/xorg-server/files/extra-new-arch-i386
View file

@ -1,11 +0,0 @@
--- 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