:-'Generic Commit'
This commit is contained in:
parent
b88258f49f
commit
919eca300c
@ -14,7 +14,7 @@ if [ ! -f "${DROPSHELL_BUILD_DIR}" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
#/bin/bash "${SCRIPT_DIR}/build_openssl.sh"
|
"${SCRIPT_DIR}/build_openssl.sh"
|
||||||
|
|
||||||
|
|
||||||
# run the build script
|
# run the build script
|
||||||
|
@ -1,13 +1,19 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
OPENSSL_VERSION=3.5.1
|
OPENSSL_VERSION=3.5.0
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
BUILD_DIR="${SCRIPT_DIR}/build"
|
BUILD_DIR="${SCRIPT_DIR}/build"
|
||||||
MUSL_CROSS_DIR="$HOME/.musl-cross"
|
MUSL_CROSS_DIR="$HOME/.musl-cross"
|
||||||
mkdir -p "$BUILD_DIR"
|
mkdir -p "$BUILD_DIR"
|
||||||
|
|
||||||
|
# Helper: compare versions (returns 0 if $1 >= $2)
|
||||||
|
version_ge() {
|
||||||
|
[ "$1" = "$2" ] && return 0
|
||||||
|
[ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ]
|
||||||
|
}
|
||||||
|
|
||||||
# Find all installed musl toolchains
|
# Find all installed musl toolchains
|
||||||
TOOLCHAINS=()
|
TOOLCHAINS=()
|
||||||
for tc in "$MUSL_CROSS_DIR"/*-linux-musl-cross; do
|
for tc in "$MUSL_CROSS_DIR"/*-linux-musl-cross; do
|
||||||
@ -43,8 +49,29 @@ for ARCH in "${TOOLCHAINS[@]}"; do
|
|||||||
AR="$MUSL_PREFIX/bin/${ARCH}-linux-musl-ar"
|
AR="$MUSL_PREFIX/bin/${ARCH}-linux-musl-ar"
|
||||||
RANLIB="$MUSL_PREFIX/bin/${ARCH}-linux-musl-ranlib"
|
RANLIB="$MUSL_PREFIX/bin/${ARCH}-linux-musl-ranlib"
|
||||||
|
|
||||||
|
SKIP_BUILD=0
|
||||||
if [ -f "$SYSROOT/usr/lib/libssl.a" ]; then
|
if [ -f "$SYSROOT/usr/lib/libssl.a" ]; then
|
||||||
echo "libssl.a already exists for $ARCH at $SYSROOT/usr/lib/libssl.a, skipping build."
|
# Try to extract version from opensslv.h
|
||||||
|
OPENSSLV_H="$SYSROOT/usr/include/openssl/opensslv.h"
|
||||||
|
if [ -f "$OPENSSLV_H" ]; then
|
||||||
|
INSTALLED_VERSION=$(grep '# *define *OPENSSL_VERSION_TEXT' "$OPENSSLV_H" | sed -E 's/.*OpenSSL ([0-9.]+)[^ ]*.*/\1/')
|
||||||
|
if [ -n "$INSTALLED_VERSION" ]; then
|
||||||
|
echo "Found installed OpenSSL version: $INSTALLED_VERSION"
|
||||||
|
if version_ge "$INSTALLED_VERSION" "$OPENSSL_VERSION"; then
|
||||||
|
echo "OpenSSL $INSTALLED_VERSION is up-to-date (>= $OPENSSL_VERSION), skipping build for $ARCH."
|
||||||
|
SKIP_BUILD=1
|
||||||
|
else
|
||||||
|
echo "OpenSSL $INSTALLED_VERSION is older than $OPENSSL_VERSION, will rebuild."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Could not determine installed OpenSSL version, will rebuild."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "No opensslv.h found, will rebuild."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$SKIP_BUILD" -eq 1 ]; then
|
||||||
echo
|
echo
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
|
#ifndef CPPHTTPLIB_OPENSSL_SUPPORT
|
||||||
#define CPPHTTPLIB_OPENSSL_SUPPORT
|
#define CPPHTTPLIB_OPENSSL_SUPPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "GetbinClient.hpp"
|
#include "GetbinClient.hpp"
|
||||||
#include "httplib.hpp"
|
#include "httplib.hpp"
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user