diff options
| author | zeising <zeising@FreeBSD.org> | 2013-02-03 05:45:42 +0800 |
|---|---|---|
| committer | zeising <zeising@FreeBSD.org> | 2013-02-03 05:45:42 +0800 |
| commit | fc25424de2a1b111bce5050e32434953919d7441 (patch) | |
| tree | 4d10dd23a9ed2848e6005a4ab668c7c2e92060c5 | |
| parent | b45ecf6aa838c71f50d68ab446d7f457d2507c36 (diff) | |
| download | freebsd-ports-gnome-fc25424de2a1b111bce5050e32434953919d7441.tar.gz freebsd-ports-gnome-fc25424de2a1b111bce5050e32434953919d7441.tar.zst freebsd-ports-gnome-fc25424de2a1b111bce5050e32434953919d7441.zip | |
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)
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 6 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-arch-i386 (renamed from x11-servers/xorg-server/files/extra-old-arch-i386) | 0 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-new-arch-i386 | 11 |
3 files changed, 1 insertions, 16 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 5057edfe12ab..afcc6c7277ae 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -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 diff --git a/x11-servers/xorg-server/files/extra-old-arch-i386 b/x11-servers/xorg-server/files/extra-arch-i386 index c5e558c2cdd0..c5e558c2cdd0 100644 --- a/x11-servers/xorg-server/files/extra-old-arch-i386 +++ b/x11-servers/xorg-server/files/extra-arch-i386 diff --git a/x11-servers/xorg-server/files/extra-new-arch-i386 b/x11-servers/xorg-server/files/extra-new-arch-i386 deleted file mode 100644 index 1a0bdeef2bd0..000000000000 --- a/x11-servers/xorg-server/files/extra-new-arch-i386 +++ /dev/null @@ -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 |