upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix crosscompile shell syntax.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2021-09-21 09:23:38 +02:00
parent 38f500f1c9
commit 24d0dc1725
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,5 +1,6 @@
21 September 2021: Wouter 21 September 2021: Wouter
- For crosscompile on windows, detect 64bit stackprotector library. - For crosscompile on windows, detect 64bit stackprotector library.
- Fix crosscompile shell syntax.
20 September 2021: Wouter 20 September 2021: Wouter
- Fix crosscompile on windows to work with openssl 3.0.0 the - Fix crosscompile on windows to work with openssl 3.0.0 the

6
makedist.sh
View file

@ -274,14 +274,14 @@ if [ "$DOWIN" = "yes" ]; then
if test "$W64" = "yes" -a -f /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll; then if test "$W64" = "yes" -a -f /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll; then
# stack protector lib needs to link in to make # stack protector lib needs to link in to make
# -lws2_32 work in openssl link stage # -lws2_32 work in openssl link stage
SSPLIB="__CNF_LDLIBS=-l:libssp.a" SSPLIB="-l:libssp.a"
else else
# disable SSPLIB for 32bit or if no such file # disable SSPLIB for 32bit or if no such file
SSPLIB="" SSPLIB=""
fi fi
info "winssl: Configure no-shared $sslflags" info "winssl: Configure no-shared $sslflags"
set -x # echo the configure command set -x # echo the configure command
$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" no-shared $sslflags || error_cleanup "OpenSSL Configure failed" __CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" no-shared $sslflags || error_cleanup "OpenSSL Configure failed"
set +x set +x
info "winssl: make" info "winssl: make"
make $MINJ || error_cleanup "OpenSSL crosscompile failed" make $MINJ || error_cleanup "OpenSSL crosscompile failed"
@ -296,7 +296,7 @@ if [ "$DOWIN" = "yes" ]; then
cd openssl_shared cd openssl_shared
info "winssl: Configure shared $sslflags" info "winssl: Configure shared $sslflags"
set -x # echo the configure command set -x # echo the configure command
$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslsharedinstall" shared $sslflags || error_cleanup "OpenSSL Configure failed" __CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslsharedinstall" shared $sslflags || error_cleanup "OpenSSL Configure failed"
set +x set +x
info "winssl: make" info "winssl: make"
make $MINJ || error_cleanup "OpenSSL crosscompile failed" make $MINJ || error_cleanup "OpenSSL crosscompile failed"