svn commit: r390463 - in head/databases/cassandra-cpp-driver: . files

[Pietro Cerutti]

Author: gahr
Date: Tue Jun 23 21:22:08 2015
New Revision: 390463
URL: https://svnweb.freebsd.org/changeset/ports/390463

Log:
  - Fix build with Clang 3.6
    Upstreamed at: https://github.com/datastax/cpp-driver/pull/179
  - Explicitely add static library

Added:
  head/databases/cassandra-cpp-driver/files/
  head/databases/cassandra-cpp-driver/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/databases/cassandra-cpp-driver/Makefile

Modified: head/databases/cassandra-cpp-driver/Makefile
==============================================================================
--- head/databases/cassandra-cpp-driver/Makefile	Tue Jun 23 21:16:00 2015	(r390462)
+++ head/databases/cassandra-cpp-driver/Makefile	Tue Jun 23 21:22:08 2015	(r390463)
@@ -17,7 +17,8 @@ GH_ACCOUNT=	datastax
 GH_PROJECT=	cpp-driver
 
 USES=		cmake:outsource
-CMAKE_ARGS=	-DCMAKE_INSTALL_LIBDIR:STRING=lib
+CMAKE_ARGS=	-DCMAKE_INSTALL_LIBDIR:STRING=lib \
+		-DCASS_BUILD_STATIC:BOOL=ON
 
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes

Added: head/databases/cassandra-cpp-driver/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/cassandra-cpp-driver/files/patch-CMakeLists.txt	Tue Jun 23 21:22:08 2015	(r390463)
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig	2015-05-18 16:31:48 UTC
++++ CMakeLists.txt
+@@ -421,6 +421,9 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQU
+   # Clang/Intel specific compiler options
+   # I disabled long-long warning because boost generates about 50 such warnings
+   set(WARNING_COMPILER_FLAGS "-Wall -pedantic -Wextra -Wno-long-long -Wno-unused-parameter -Wno-variadic-macros -Wno-zero-length-array")
++  if(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER "3.6")
++      set(WARNING_COMPILER_FLAGS "${WARNING_COMPILER_FLAGS} -Wno-unused-local-typedef ")
++  endif()
+ 
+   # OpenSSL is deprecated on later versions of Mac OS X. The long-term solution
+   # is to provide a CommonCryto implementation.