diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-01-18 20:34:04 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-01-18 20:34:04 +0800 |
| commit | 37ee826ef87327bbbaf99da15acda015d557daad (patch) | |
| tree | 0ff45363d4790961ddda70dba8c14b1a762601af | |
| parent | c0742d8b66300b5881a89f8b7eeb8bc92809288a (diff) | |
| download | xorg-devel-ports-37ee826ef87327bbbaf99da15acda015d557daad.tar xorg-devel-ports-37ee826ef87327bbbaf99da15acda015d557daad.tar.gz xorg-devel-ports-37ee826ef87327bbbaf99da15acda015d557daad.tar.bz2 xorg-devel-ports-37ee826ef87327bbbaf99da15acda015d557daad.tar.lz xorg-devel-ports-37ee826ef87327bbbaf99da15acda015d557daad.tar.xz xorg-devel-ports-37ee826ef87327bbbaf99da15acda015d557daad.tar.zst xorg-devel-ports-37ee826ef87327bbbaf99da15acda015d557daad.zip | |
Try to fix build on i386 when using clang.
PR: ports/174286 (based on)
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@630 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 3 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-arch-i386 | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index e54027d..951db4d 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -33,7 +33,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-include_eventstr.h \ ${FILESDIR}/extra-os-utils.c \ ${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \ ${FILESDIR}/extra-Xserver-os-xprintf.c \ - ${FILESDIR}/extra-servermd.h + ${FILESDIR}/extra-servermd.h \ + ${FILESDIR}/extra-arch-i386 .endif USE_BZIP2= yes 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 0000000..c5e558c --- /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 |