diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-09-08 19:17:52 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-09-08 19:17:52 +0800 |
| commit | 3251814e7f42d8e82d38a8508d23b36987135f02 (patch) | |
| tree | 7840f1f92d2576bc201b69afe41eec19223e81c4 | |
| parent | c837a558fe68d0a16a138869d55d41207da11c1c (diff) | |
| download | xorg-devel-ports-3251814e7f42d8e82d38a8508d23b36987135f02.tar xorg-devel-ports-3251814e7f42d8e82d38a8508d23b36987135f02.tar.gz xorg-devel-ports-3251814e7f42d8e82d38a8508d23b36987135f02.tar.bz2 xorg-devel-ports-3251814e7f42d8e82d38a8508d23b36987135f02.tar.lz xorg-devel-ports-3251814e7f42d8e82d38a8508d23b36987135f02.tar.xz xorg-devel-ports-3251814e7f42d8e82d38a8508d23b36987135f02.tar.zst xorg-devel-ports-3251814e7f42d8e82d38a8508d23b36987135f02.zip | |
Fix detection of TLS with clang.
PR: ports/181838 (based on)
Submitted by: Tijl Coosemans <tijl@FreeBSD.org>
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1142 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 3 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-configure | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index a4d3833..0e4077c 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -31,7 +31,8 @@ OPTIONS_DEFAULT=AIGLX SUID XORG_VERSION= 1.12.4 XORG_REVISION= 1 PLIST_SUB+= OLD="@comment " NEW="" -EXTRA_PATCHES+= ${FILESDIR}/extra-clang +EXTRA_PATCHES+= ${FILESDIR}/extra-clang \ + ${FILESDIR}/extra-configure .else XORG_VERSION= 1.7.7 XORG_REVISION= 8 diff --git a/x11-servers/xorg-server/files/extra-configure b/x11-servers/xorg-server/files/extra-configure new file mode 100644 index 0000000..cede35b --- /dev/null +++ b/x11-servers/xorg-server/files/extra-configure @@ -0,0 +1,11 @@ +--- configure.orig 2013-09-07 22:11:27.210621324 +0200 ++++ configure 2013-09-07 22:11:52.912624338 +0200 +@@ -22839,7 +22839,7 @@ + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_tls=$kw ++ ac_cv_tls=$kw; break ; + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done |