diff options
| author | zeising <zeising@FreeBSD.org> | 2013-01-19 20:35:40 +0800 |
|---|---|---|
| committer | zeising <zeising@FreeBSD.org> | 2013-01-19 20:35:40 +0800 |
| commit | bca04885c7a73b45eac847d24339d6585d65c96c (patch) | |
| tree | d9ab4049b52ddef79972840336719c75bfe7ee53 /x11-servers | |
| parent | d52b65ef0eff7377bb4d48a2f435382d3338eae2 (diff) | |
| download | freebsd-ports-gnome-bca04885c7a73b45eac847d24339d6585d65c96c.tar.gz freebsd-ports-gnome-bca04885c7a73b45eac847d24339d6585d65c96c.tar.zst freebsd-ports-gnome-bca04885c7a73b45eac847d24339d6585d65c96c.zip | |
Fix build on i386 when building with clang.
PR: ports/174286 (inspired by)
Submitted by: deeptech71 <deeptech71@gmail.com>
Tested by: crees, kwm
Approved by: kwm, miwi (mentors, implicit)
Obtained from: xorg-dev repo
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 8 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-new-arch-i386 | 11 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-old-arch-i386 | 11 |
3 files changed, 30 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index ac6e6fe5202e..5057edfe12ab 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -113,6 +113,14 @@ CONFIGURE_ARGS+=--enable-install-setuid=yes 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 +.endif + .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64 diff --git a/x11-servers/xorg-server/files/extra-new-arch-i386 b/x11-servers/xorg-server/files/extra-new-arch-i386 new file mode 100644 index 000000000000..1a0bdeef2bd0 --- /dev/null +++ b/x11-servers/xorg-server/files/extra-new-arch-i386 @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..c5e558c2cdd0 --- /dev/null +++ b/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 |