diff options
| author | gahr <gahr@FreeBSD.org> | 2015-06-24 05:22:08 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2015-06-24 05:22:08 +0800 |
| commit | 5bed687d344a735dd192b02c875220bc8200bc4f (patch) | |
| tree | 7bb83133ae4c4518b83516967d4a63eafcf8c1c7 /databases | |
| parent | e46f921f4914a1c413b763868cebcda95bc45b2e (diff) | |
| download | freebsd-ports-gnome-5bed687d344a735dd192b02c875220bc8200bc4f.tar.gz freebsd-ports-gnome-5bed687d344a735dd192b02c875220bc8200bc4f.tar.zst freebsd-ports-gnome-5bed687d344a735dd192b02c875220bc8200bc4f.zip | |
- Fix build with Clang 3.6
Upstreamed at: https://github.com/datastax/cpp-driver/pull/179
- Explicitely add static library
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/cassandra-cpp-driver/Makefile | 3 | ||||
| -rw-r--r-- | databases/cassandra-cpp-driver/files/patch-CMakeLists.txt | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/databases/cassandra-cpp-driver/Makefile b/databases/cassandra-cpp-driver/Makefile index c71c10f09c28..cc18f355a7a4 100644 --- a/databases/cassandra-cpp-driver/Makefile +++ b/databases/cassandra-cpp-driver/Makefile @@ -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 diff --git a/databases/cassandra-cpp-driver/files/patch-CMakeLists.txt b/databases/cassandra-cpp-driver/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..c88ce9613e66 --- /dev/null +++ b/databases/cassandra-cpp-driver/files/patch-CMakeLists.txt @@ -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. |