stop setting USE_OPENSSL

openziti · Jun 12, 2023 · a06f181 · a06f181
1 parent d78d341
commit a06f181
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 19 deletions.
diff --git a/.github/actions/openziti-tunnel-build-action/redhat-8/entrypoint.sh b/.github/actions/openziti-tunnel-build-action/redhat-8/entrypoint.sh
@@ -47,7 +47,6 @@ cmake -E make_directory ./build
             --preset "${cmake_preset}" \
             -DCMAKE_BUILD_TYPE="${cmake_config}" \
             -DBUILD_DIST_PACKAGES=ON \
-            -DUSE_OPENSSL=ON \
             -S . \
             -B ./build 
     source scl_source enable gcc-toolset-10 \

diff --git a/.github/actions/openziti-tunnel-build-action/redhat-9/entrypoint.sh b/.github/actions/openziti-tunnel-build-action/redhat-9/entrypoint.sh
@@ -45,7 +45,6 @@ done
         --preset "${cmake_preset}" \
         -DCMAKE_BUILD_TYPE="${cmake_config}" \
         -DBUILD_DIST_PACKAGES=ON \
-        -DUSE_OPENSSL=ON \
         -S . \
         -B ./build 
     cmake \

diff --git a/docker/linux-cross-build.sh b/docker/linux-cross-build.sh
@@ -8,20 +8,14 @@ set -x
 
 DIRNAME=$(dirname $0)
 REPO_DIR=${DIRNAME}/..            # parent of the top-level dir where this script lives
-: ${USE_OPENSSL:="OFF"}
 : ${TARGET:="bundle"}
 : ${BUILD_DIST_PACKAGES:="OFF"}
 : ${DISABLE_LIBSYSTEMD_FEATURE:="OFF"}
 
 if (( ${#} )); then
     for OPT in ${*}; do
         case $OPT in
-            --openssl)
-                USE_OPENSSL="ON"
-                shift
-            ;;
             --package)
-                USE_OPENSSL="ON"
                 TARGET="package"
                 BUILD_DIST_PACKAGES="ON"
                 shift
@@ -50,7 +44,6 @@ for ARCH in ${JOBS[@]}; do
         amd64)  { cmake \
                     -DCMAKE_BUILD_TYPE=Release \
                     -DCMAKE_TOOLCHAIN_FILE=${REPO_DIR}/toolchains/default.cmake \
-                    -DUSE_OPENSSL=${USE_OPENSSL} \
                     -DBUILD_DIST_PACKAGES=${BUILD_DIST_PACKAGES} \
                     -DDISABLE_LIBSYSTEMD_FEATURE=${DISABLE_LIBSYSTEMD_FEATURE} \
                     -S ${REPO_DIR} \
@@ -64,7 +57,6 @@ for ARCH in ${JOBS[@]}; do
         arm64)  { cmake \
                     -DCMAKE_BUILD_TYPE=Release \
                     -DCMAKE_TOOLCHAIN_FILE=${REPO_DIR}/toolchains/Linux-arm64.cmake \
-                    -DUSE_OPENSSL=${USE_OPENSSL} \
                     -DBUILD_DIST_PACKAGES=${BUILD_DIST_PACKAGES} \
                     -DDISABLE_LIBSYSTEMD_FEATURE=${DISABLE_LIBSYSTEMD_FEATURE} \
                     -S ${REPO_DIR} \
@@ -78,7 +70,6 @@ for ARCH in ${JOBS[@]}; do
         arm)    { cmake \
                     -DCMAKE_BUILD_TYPE=Release \
                     -DCMAKE_TOOLCHAIN_FILE=${REPO_DIR}/toolchains/Linux-arm.cmake \
-                    -DUSE_OPENSSL=${USE_OPENSSL} \
                     -DBUILD_DIST_PACKAGES=${BUILD_DIST_PACKAGES} \
                     -DDISABLE_LIBSYSTEMD_FEATURE=${DISABLE_LIBSYSTEMD_FEATURE} \
                     -S ${REPO_DIR} \

diff --git a/docker/linux-native-build.sh b/docker/linux-native-build.sh
@@ -8,20 +8,14 @@ set -x
 
 DIRNAME=$(dirname $0)
 REPO_DIR=${DIRNAME}/..            # parent of the top-level dir where this script lives
-: ${USE_OPENSSL:="OFF"}
 : ${TARGET:="bundle"}
 : ${BUILD_DIST_PACKAGES:="OFF"}
 : ${DISABLE_LIBSYSTEMD_FEATURE:="OFF"}
 
 if (( ${#} )); then
     for OPT in ${*}; do
         case $OPT in
-            --openssl)
-                USE_OPENSSL="ON"
-                shift
-            ;;
             --package)
-                USE_OPENSSL="ON"
                 TARGET="package"
                 BUILD_DIST_PACKAGES="ON"
                 shift
@@ -41,7 +35,6 @@ mkdir ${CMAKE_BUILD_DIR}
 cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_TOOLCHAIN_FILE=${REPO_DIR}/toolchains/default.cmake \
-    -DUSE_OPENSSL=${USE_OPENSSL} \
     -DBUILD_DIST_PACKAGES=${BUILD_DIST_PACKAGES} \
     -DDISABLE_LIBSYSTEMD_FEATURE=${DISABLE_LIBSYSTEMD_FEATURE} \
     -S ${REPO_DIR} \

diff --git a/scripts/openwrt-build.sh b/scripts/openwrt-build.sh
@@ -90,7 +90,7 @@ if [ -x /usr/bin/ninja ]; then
 fi
 
 if [ -f "$target_dir/usr/include/openssl/opensslv.h" ]; then
-  CMAKE_OPTS="$CMAKE_OPTS -DUSE_OPENSSL=on"
+  CMAKE_OPTS="$CMAKE_OPTS"
 fi
 
 if [ -f "$target_dir/usr/include/sodium.h" ]; then