Selaa lähdekoodia

Merge pull request #11525 from richardkchapman/update-couchbase

HPCC-20208 Need newer version of libcouchbase to work with OpenSSL1.1/ Ubuntu 18.04

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 6 vuotta sitten
vanhempi
commit
2cca8d3303
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 2 2
      plugins/couchbase/CMakeLists.txt
  2. 1 1
      plugins/couchbase/libcouchbase

+ 2 - 2
plugins/couchbase/CMakeLists.txt

@@ -29,11 +29,11 @@ IF ( COUCHBASEEMBED )
     if(APPLE)
         set(LIBCOUCHBASE_LIB ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so)
         set(LIBCOUCHBASE_LIB_SONAME ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so.2)
-        set(LIBCOUCHBASE_LIB_REAL ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so.2.0.38)
+        set(LIBCOUCHBASE_LIB_REAL ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so.2.0.59)
     else()
         set(LIBCOUCHBASE_LIB ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so)
         set(LIBCOUCHBASE_LIB_SONAME ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so.2)
-        set(LIBCOUCHBASE_LIB_REAL ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so.2.0.38)
+        set(LIBCOUCHBASE_LIB_REAL ${CMAKE_CURRENT_BINARY_DIR}/libcouchbase-build/lib/libcouchbase.so.2.0.59)
     endif()
 
     set(SSL_INC "")

+ 1 - 1
plugins/couchbase/libcouchbase

@@ -1 +1 @@
-Subproject commit 822615ccbeecb9107bc4c02616b41aed6d9938c0
+Subproject commit 3ec427acce0709afeb72f3e88e38a50d18db9353