Skip to content

Commit

Permalink
build.sh: -no-tests added for OpenSSL Configure; `-fembed-bitco…
Browse files Browse the repository at this point in the history
…de` removed for both OpenSSL and libssh2
  • Loading branch information
mezantrop committed Dec 9, 2024
1 parent 9299ff7 commit 1f3c44e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG

* **2024.11.10 Current**
* **2024.12.09 Current**
* `build.sh`: `-no-tests` added for OpenSSL `Configure`; `-fembed-bitcode` removed for both OpenSSL and libssh2
* `gui-warp.py`: Highlight "Save" button for INI/FW if config has been edited. Thanks Radek Sipka for the request

* **2024.11.08 ts-warp-1.5.7, gui-warp-1.0.26 (gui-warp-v1.0.33-mac), ns-warp-1.0.7**
Expand Down
8 changes: 4 additions & 4 deletions gui/ports/macOS/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ echo "-- Making binaries -------------------------------------------------------
echo "-- Compiling SSL for ARM64 processors ---------------------------------------------------------------------------" &&
cd openssl-master &&

./Configure darwin64-arm64-cc no-shared -mmacosx-version-min=11 -fembed-bitcode &&
./Configure darwin64-arm64-cc no-shared -mmacosx-version-min=11 -no-tests &&
make depend &&
make -j 4 build_libs &&
cp libcrypto.a ../arm64_libcrypto.a &&
Expand All @@ -33,23 +33,23 @@ echo "-- Making binaries -------------------------------------------------------

echo "-- Compiling SSL for x86_64 processors --------------------------------------------------------------------------" &&
make clean &&
./Configure darwin64-x86_64-cc no-shared -mmacosx-version-min=11 -fembed-bitcode &&
./Configure darwin64-x86_64-cc no-shared -mmacosx-version-min=11 -no-tests &&
make depend &&
make -j 4 build_libs &&
cp libcrypto.a ../x86_64_libcrypto.a &&
cp libssl.a ../x86_64_libssl.a &&

echo "-- Compiling SSH2 for ARM64 processors --------------------------------------------------------------------------" &&
cd ../libssh2-master &&
export CFLAGS="-arch arm64 -pipe -no-cpp-precomp -mmacosx-version-min=11 -fembed-bitcode" &&
export CFLAGS="-arch arm64 -pipe -no-cpp-precomp -mmacosx-version-min=11" &&
export CPPFLAGS="-arch arm64 -pipe -no-cpp-precomp -mmacosx-version-min=11" &&
autoreconf -fi &&
./configure --host=aarch64-apple-darwin --disable-debug --disable-dependency-tracking --disable-silent-rules --disable-examples-build --with-libz --disable-shared --enable-static &&
make -j 4 &&
cp src/.libs/libssh2.a ../arm64_libssh2.a &&

make clean &&
export CFLAGS="-arch x86_64 -pipe -no-cpp-precomp -mmacosx-version-min=11 -fembed-bitcode" &&
export CFLAGS="-arch x86_64 -pipe -no-cpp-precomp -mmacosx-version-min=11" &&
export CPPFLAGS="-arch x86_64 -pipe -no-cpp-precomp -mmacosx-version-min=11" &&
autoreconf -fi &&
./configure --host=x86_64-apple-darwin --disable-debug --disable-dependency-tracking --disable-silent-rules --disable-examples-build --with-libz --disable-shared --enable-static &&
Expand Down

0 comments on commit 1f3c44e

Please sign in to comment.