cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on i386 when building with clang.

Browse Source 
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
This commit is contained in:
Niclas Zeising 2013-01-19 12:35:40 +00:00
parent e8845cc18b
commit b1d186d5f3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=310652
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11-servers/xorg-server/Makefile
View File

@ -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

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

@ -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

11
x11-servers/xorg-server/files/extra-old-arch-i386 Normal file
View File

@ -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