svn commit: r368257 - in head/textproc/srilm: . files

[Dmitry Sivachenko]

Author: demon
Date: Mon Sep 15 09:04:02 2014
New Revision: 368257
URL: http://svnweb.freebsd.org/changeset/ports/368257
QAT: https://qat.redports.org/buildarchive/r368257/

Log:
  Fix build to clang and remove dependency on gcc.
  
  Maintainer timeout.

Added:
  head/textproc/srilm/files/patch-dstruct-src-Array.h   (contents, props changed)
Modified:
  head/textproc/srilm/Makefile

Modified: head/textproc/srilm/Makefile
==============================================================================
--- head/textproc/srilm/Makefile	Mon Sep 15 08:48:33 2014	(r368256)
+++ head/textproc/srilm/Makefile	Mon Sep 15 09:04:02 2014	(r368257)
@@ -16,7 +16,6 @@ LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lan
 DOWNLOAD_URL?=	http://www.speech.sri.com/projects/srilm/download.html
 
 USES=		gmake
-USE_GCC=	yes
 MAKE_ENV+=	SRILM=${WRKSRC}
 ALL_TARGET=	World
 ONLY_FOR_ARCHS=	i386 amd64

Added: head/textproc/srilm/files/patch-dstruct-src-Array.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/srilm/files/patch-dstruct-src-Array.h	Mon Sep 15 09:04:02 2014	(r368257)
@@ -0,0 +1,11 @@
+--- dstruct/src/Array.h.orig	2014-09-02 15:48:38.000000000 +0400
++++ dstruct/src/Array.h	2014-09-02 15:48:57.000000000 +0400
+@@ -89,7 +89,7 @@ public:
+  * gcc and icc allow this as part of the language, but many other C++ compilers
+  * don't (Sun Studio, MS Visual C).
+  */
+-#if !defined(DEBUG) && defined(__GNUC__) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >=900)
++#if !defined(DEBUG) && !defined(__clang__) && defined(__GNUC__) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >=900)
+ # define makeArray(T, A, n)		T A[n]
+ #else
+ # define makeArray(T, A, n)		StaticArray<T> A(n)