Skip to content

Commit e9ca26b

Browse files
authored
use local openssl on Jenkins (#65)
1 parent 097eba2 commit e9ca26b

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

bin/build

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ CB_CXX = ENV.fetch("CB_CXX", default_cxx)
7474

7575
run("#{CB_PHP_PREFIX}/bin/php --version")
7676
run("#{CB_PHP_PREFIX}/bin/php --ini")
77+
run("#{CB_PHP_PREFIX}/bin/php-config")
78+
79+
LOCAL_OPENSSL="/usr/local/openssl"
80+
CB_OPENSSL_ROOT = ENV.fetch("CB_OPENSSL_ROOT", File.directory?(LOCAL_OPENSSL) ? LOCAL_OPENSSL : nil)
81+
if CB_OPENSSL_ROOT
82+
ENV["COUCHBASE_CMAKE_EXTRA"] = "-DOPENSSL_ROOT_DIR=#{CB_OPENSSL_ROOT}"
83+
end
7784

7885
Dir.chdir(PROJECT_ROOT) do
7986
run("#{CB_PHP_PREFIX}/bin/phpize")

config.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ CMAKE_CXX_FLAGS : ${CXXFLAGS}
4848
COUCHBASE_PHP_INCLUDES : ${INCLUDES}
4949
COUCHBASE_PHP_LDFLAGS : ${LDFLAGS}
5050
COUCHBASE_PHP_LIBDIR : ${phplibdir}
51+
COUCHBASE_CMAKE_EXTRA : ${COUCHBASE_CMAKE_EXTRA}
5152
"
5253
${CMAKE} -S ${COUCHBASE_CMAKE_SOURCE_DIRECTORY} -B${COUCHBASE_CMAKE_BUILD_DIRECTORY} \
5354
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -61,5 +62,5 @@ COUCHBASE_PHP_LIBDIR : ${phplibdir}
6162
-DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF \
6263
-DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF \
6364
-DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=OFF \
64-
-DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF
65+
-DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF ${COUCHBASE_CMAKE_EXTRA}
6566
])

0 commit comments

Comments
 (0)