mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-18 23:06:06 -05:00
Fix for analysis and ports workflows iOS, Windows (#1361)
Some checks failed
ci / build (push) Has been cancelled
Some checks failed
ci / build (push) Has been cancelled
* - Remove SDK_VERSION and only run failed jobs, echo windows config.log * Use commented out to fix syntax of ci. * - Turn off succeeded tests, only link libssp for cross compile, use no-shared for openssl ios. * - Remove iPhone armv7s, and iPhoneSimulator i386 from ios ci. The lib system does not provide symbols for it on the new macos runner. - Fix to exclude libssp for windows compiles.
This commit is contained in:
Wouter Wijngaards
GitHub
parent
964848b94a
commit
aa21e38b3a
4 changed files with 28 additions and 42 deletions
25
.github/workflows/analysis_ports.yml
vendored
25
.github/workflows/analysis_ports.yml
vendored
|
|
@ -49,23 +49,12 @@ jobs:
|
|||
os: ubuntu-latest
|
||||
config: 'CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address" --disable-flto --disable-static'
|
||||
make_test: "yes"
|
||||
- name: Apple iPhone on iOS, armv7
|
||||
os: macos-latest
|
||||
AUTOTOOLS_HOST: armv7-apple-ios
|
||||
OPENSSL_HOST: ios-cross
|
||||
IOS_SDK: iPhoneOS
|
||||
IOS_CPU: armv7s
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
- name: Apple iPhone on iOS, arm64
|
||||
os: macos-latest
|
||||
AUTOTOOLS_HOST: aarch64-apple-ios
|
||||
OPENSSL_HOST: ios64-cross
|
||||
IOS_SDK: iPhoneOS
|
||||
IOS_CPU: arm64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -75,7 +64,6 @@ jobs:
|
|||
OPENSSL_HOST: ios64-cross
|
||||
IOS_SDK: AppleTVOS
|
||||
IOS_CPU: arm64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -88,23 +76,12 @@ jobs:
|
|||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
- name: iPhoneSimulator on OS X, i386
|
||||
os: macos-latest
|
||||
AUTOTOOLS_HOST: i386-apple-ios
|
||||
OPENSSL_HOST: iphoneos-cross
|
||||
IOS_SDK: iPhoneSimulator
|
||||
IOS_CPU: i386
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
- name: iPhoneSimulator on OS X, x86_64
|
||||
os: macos-latest
|
||||
AUTOTOOLS_HOST: x86_64-apple-ios
|
||||
OPENSSL_HOST: iphoneos-cross
|
||||
IOS_SDK: iPhoneSimulator
|
||||
IOS_CPU: x86_64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -114,7 +91,6 @@ jobs:
|
|||
OPENSSL_HOST: iphoneos-cross
|
||||
IOS_SDK: AppleTVSimulator
|
||||
IOS_CPU: x86_64
|
||||
SDK_VERSION: 18.0
|
||||
test_ios: "yes"
|
||||
config: "no"
|
||||
make: "no"
|
||||
|
|
@ -336,7 +312,6 @@ jobs:
|
|||
OPENSSL_HOST: ${{ matrix.OPENSSL_HOST }}
|
||||
IOS_SDK: ${{ matrix.IOS_SDK }}
|
||||
IOS_CPU: ${{ matrix.IOS_CPU }}
|
||||
SDK_VERSION: ${{ matrix.SDK_VERSION }}
|
||||
run: |
|
||||
#(already installed) ./contrib/ios/install_tools.sh
|
||||
export AUTOTOOLS_BUILD="$(./config.guess)"
|
||||
|
|
|
|||
4
configure
vendored
4
configure
vendored
|
|
@ -22804,6 +22804,7 @@ then :
|
|||
LIBS="$LIBS -lz"
|
||||
fi
|
||||
|
||||
if echo "$host" | $GREP -i -e linux >/dev/null; then
|
||||
if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
|
||||
:
|
||||
else
|
||||
|
|
@ -22811,6 +22812,7 @@ fi
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# set full static linking if requested
|
||||
# Check whether --enable-fully-static was given.
|
||||
|
|
@ -22868,6 +22870,7 @@ then :
|
|||
LIBS="$LIBS -lz"
|
||||
fi
|
||||
|
||||
if echo "$host" | $GREP -i -e linux >/dev/null; then
|
||||
if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
|
||||
:
|
||||
else
|
||||
|
|
@ -22875,6 +22878,7 @@ fi
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# set lock checking if requested
|
||||
# Check whether --enable-lock_checks was given.
|
||||
|
|
|
|||
|
|
@ -1673,6 +1673,7 @@ if test x_$enable_static_exe = x_yes; then
|
|||
LIBS="$LIBS -lgdi32"
|
||||
fi
|
||||
AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
|
||||
if echo "$host" | $GREP -i -e linux >/dev/null; then
|
||||
if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
|
||||
:
|
||||
else
|
||||
|
|
@ -1680,6 +1681,7 @@ if test x_$enable_static_exe = x_yes; then
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# set full static linking if requested
|
||||
AC_ARG_ENABLE(fully-static, AS_HELP_STRING([--enable-fully-static],[ enable to compile fully static ]),
|
||||
|
|
@ -1694,6 +1696,7 @@ if test x_$enable_fully_static = x_yes; then
|
|||
LIBS="$LIBS -lgdi32"
|
||||
fi
|
||||
AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
|
||||
if echo "$host" | $GREP -i -e linux >/dev/null; then
|
||||
if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
|
||||
:
|
||||
else
|
||||
|
|
@ -1701,6 +1704,7 @@ if test x_$enable_fully_static = x_yes; then
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# set lock checking if requested
|
||||
AC_ARG_ENABLE(lock_checks, AS_HELP_STRING([--enable-lock-checks],[ enable to check lock and unlock calls, for debug purposes ]),
|
||||
|
|
|
|||
|
|
@ -3,9 +3,12 @@
|
|||
- Fix to reply with SERVFAIL when the wait-limit is exceeded.
|
||||
- Add extended dns error code for invalid query type to definition
|
||||
list.
|
||||
- Fix to update openssl version in ios ci.
|
||||
- Fix unbound.conf man page entry for root-hints to say it can
|
||||
be used without strongly recommending it.
|
||||
- Remove iPhone armv7s, and iPhoneSimulator i386 from ios ci.
|
||||
The lib system does not provide symbols for it on the new macos
|
||||
runner.
|
||||
- Fix to exclude libssp for windows compiles.
|
||||
|
||||
10 October 2025: Wouter
|
||||
- Fix #1358 Enabling FIPS in OpenSSL causes unit test to fail.
|
||||
|
|
|
|||
Loading…
Reference in a new issue