From fc25424de2a1b111bce5050e32434953919d7441 Mon Sep 17 00:00:00 2001 From: zeising Date: Sat, 2 Feb 2013 21:45:42 +0000 Subject: Fix the patch used to make xorg-server build with clang on i386. Noticed by: Barbara Guida PR: ports/175776 [1] Submitted by: Tsurutani Naoki [1] Approved by: kwm, miwi (mentors, implicit) --- x11-servers/xorg-server/Makefile | 6 +----- x11-servers/xorg-server/files/extra-arch-i386 | 11 +++++++++++ x11-servers/xorg-server/files/extra-new-arch-i386 | 11 ----------- x11-servers/xorg-server/files/extra-old-arch-i386 | 11 ----------- 4 files changed, 12 insertions(+), 27 deletions(-) create mode 100644 x11-servers/xorg-server/files/extra-arch-i386 delete mode 100644 x11-servers/xorg-server/files/extra-new-arch-i386 delete mode 100644 x11-servers/xorg-server/files/extra-old-arch-i386 (limited to 'x11-servers') 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-arch-i386 b/x11-servers/xorg-server/files/extra-arch-i386 new file mode 100644 index 000000000000..c5e558c2cdd0 --- /dev/null +++ b/x11-servers/xorg-server/files/extra-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 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 diff --git a/x11-servers/xorg-server/files/extra-old-arch-i386 b/x11-servers/xorg-server/files/extra-old-arch-i386 deleted file mode 100644 index c5e558c2cdd0..000000000000 --- a/x11-servers/xorg-server/files/extra-old-arch-i386 +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -- cgit