Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the OpenSSL and lua-openssl build flags #644

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Update the OpenSSL and lua-openssl build flags #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c51a3b
Deps: Streamline the lua-openssl build flags
rdw-software Jan 15, 2025
afc7c6d
Deps: Update the OpenSSL build flags
rdw-software Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions deps/luaopenssl-unixbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ OUT_DIR=$(pwd)/ninjabuild-unix

LUAJIT_SRC_DIR=$(pwd)/deps/LuaJIT/LuaJIT/src
LUAJIT_LIBRARY_PATH=$OUT_DIR/libluajit.a
STATIC_LUAJIT_FLAGS="-DLUAJIT_INCLUDE_DIRS=$LUAJIT_SRC_DIR -DLUA_INCLUDE_DIR=$LUAJIT_SRC_DIR -DLUAJIT_LIBRARY=$LUAJIT_LIBRARY_PATH "

OPENSSL_DIR=$OUT_DIR
OPENSSL_INCLUDE_DIR=deps/openssl/openssl/include
LIBCRYPTO=$OUT_DIR/libcrypto.a
LIBSSL=$OUT_DIR/libssl.a
OPENSSL_INCLUDE_DIR=$(pwd)/deps/openssl/openssl/include
STATIC_OPENSSL_FLAGS="-DOPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR -DOPENSSL_USE_STATIC_LIBS=ON -DOPENSSL_ROOT_DIR=$OPENSSL_DIR"

unset PKG_CONFIG_PATH # Prevent CMake from using the system OpenSSL (which may not necessarily be compatible)

cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DOPENSSL_LIBRARIES=$OUT_DIR -DBUILD_SHARED_LUA_OPENSSL=OFF -DOPENSSL_ROOT_DIR=$OPENSSL_DIR -DOPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR -DLUAJIT_INCLUDE_DIRS=$LUAJIT_SRC_DIR -DLUAJIT_LIBRARIES=$LUAJIT_SRC_DIR -DLUA_INCLUDE_DIR=$LUAJIT_SRC_DIR -DLUAJIT_LIBRARIES=$LUAJIT_LIBRARY_PATH -DCMAKE_C_COMPILER=gcc -DOPENSSL_CRYPTO_LIBRARY=$LIBCRYPTO -DOPENSSL_SSL_LIBRARY=$LIBSSL -DLUA_OPENSSL_LIBTYPE=STATIC -DOPENSSL_USE_STATIC_LIBS=ON
cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LUA_OPENSSL=OFF -DCMAKE_C_COMPILER=gcc -DLUA_OPENSSL_LIBTYPE=STATIC $STATIC_OPENSSL_FLAGS $STATIC_LUAJIT_FLAGS
cmake --build $BUILD_DIR --clean-first

cp $BUILD_DIR/openssl.a $OUT_DIR
8 changes: 4 additions & 4 deletions deps/luaopenssl-windowsbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ OUT_DIR=$(pwd)/ninjabuild-windows

LUAJIT_SRC_DIR=$(pwd)/deps/LuaJIT/LuaJIT/src
LUAJIT_LIBRARY_PATH=$OUT_DIR/libluajit.a
STATIC_LUAJIT_FLAGS="-DLUAJIT_INCLUDE_DIRS=$LUAJIT_SRC_DIR -DLUA_INCLUDE_DIR=$LUAJIT_SRC_DIR -DLUAJIT_LIBRARY=$LUAJIT_LIBRARY_PATH "

OPENSSL_DIR=$OUT_DIR
OPENSSL_INCLUDE_DIR=deps/openssl/openssl/include
LIBCRYPTO=$OUT_DIR/libcrypto.a
LIBSSL=$OUT_DIR/libssl.a
OPENSSL_INCLUDE_DIR=$(pwd)/deps/openssl/openssl/include
STATIC_OPENSSL_FLAGS="-DOPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR -DOPENSSL_USE_STATIC_LIBS=ON -DOPENSSL_ROOT_DIR=$OPENSSL_DIR"

cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DOPENSSL_LIBRARIES=$OUT_DIR -DBUILD_SHARED_LUA_OPENSSL=OFF -DOPENSSL_ROOT_DIR=$OPENSSL_DIR -DOPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR -DLUAJIT_INCLUDE_DIRS=$LUAJIT_SRC_DIR -DLUAJIT_LIBRARIES=$LUAJIT_SRC_DIR -DLUA_INCLUDE_DIR=$LUAJIT_SRC_DIR -DLUAJIT_LIBRARIES=$LUAJIT_LIBRARY_PATH -DCMAKE_C_COMPILER=gcc -DOPENSSL_CRYPTO_LIBRARY=$LIBCRYPTO -DOPENSSL_SSL_LIBRARY=$LIBSSL -DLUA_OPENSSL_LIBTYPE=STATIC -DOPENSSL_USE_STATIC_LIBS=ON
cmake -S $SRC_DIR -B $BUILD_DIR -G Ninja -DBUILD_SHARED_LUA_OPENSSL=OFF -DCMAKE_C_COMPILER=gcc -DLUA_OPENSSL_LIBTYPE=STATIC $STATIC_OPENSSL_FLAGS $STATIC_LUAJIT_FLAGS
cmake --build $BUILD_DIR --clean-first

cp $BUILD_DIR/openssl.a $OUT_DIR
7 changes: 6 additions & 1 deletion deps/openssl-unixbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ OPENSSL_DIR=deps/openssl/openssl

cd $OPENSSL_DIR

./config no-tests no-shared no-dso
OPENSSL_STATIC_FLAGS="no-pinshared no-shared"
OPENSSL_UNUSED_FEATURES="no-dso no-module no-ui-console"
OPENSSL_UNUSED_TARGETS="no-apps no-docs no-makedepend no-tests"
OPENSSL_OPTIONAL_FEATURES="enable-ec_nistp_64_gcc_128 enable-ktls enable-tfo"
OPENSSL_FEATURE_FLAGS="$OPENSSL_UNUSED_FEATURES $OPENSSL_OPTIONAL_FEATURES $OPENSSL_UNUSED_TARGETS"
./config $OPENSSL_STATIC_FLAGS $OPENSSL_FEATURE_FLAGS

make clean
make -j $NUM_PARALLEL_JOBS
Expand Down
7 changes: 6 additions & 1 deletion deps/openssl-windowsbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ OPENSSL_DIR=deps/openssl/openssl

cd $OPENSSL_DIR

perl Configure mingw64 no-tests no-shared no-dso
OPENSSL_STATIC_FLAGS="no-pinshared no-shared"
OPENSSL_UNUSED_FEATURES="no-dso no-module no-ui-console"
OPENSSL_UNUSED_TARGETS="no-apps no-docs no-makedepend no-tests"
OPENSSL_OPTIONAL_FEATURES="enable-ec_nistp_64_gcc_128 enable-ktls enable-tfo"
OPENSSL_FEATURE_FLAGS="$OPENSSL_UNUSED_FEATURES $OPENSSL_OPTIONAL_FEATURES $OPENSSL_UNUSED_TARGETS"
perl Configure mingw64 $OPENSSL_STATIC_FLAGS $OPENSSL_FEATURE_FLAGS

make clean
make -j $NUM_PARALLEL_JOBS
Expand Down
Loading