Fix for analysis and ports workflows iOS, Windows (#1361)

* - 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.

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index 68665c8545afe004618d9a9585152ee401a44d5c..6e8090a7cc70a57d171b45bc6db118e351109466 100644 (file)
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -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)"

diff --git a/configure b/configure
index 86921411baf018a7b251ac088a64b53d9a5283a1..9ced5686e5d7127ed911259b497cb09b7ef90d41 100755 (executable)
--- a/configure
+++ b/configure
@@ -22804,10 +22804,12 @@ then :
    LIBS="$LIBS -lz"
 fi
 
-               if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
-                       :
-               else
-                       LIBS="$LIBS -l:libssp.a"
+               if echo "$host" | $GREP -i -e linux >/dev/null; then
+                       if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
+                               :
+                       else
+                               LIBS="$LIBS -l:libssp.a"
+                       fi
                fi
        fi
 fi
@@ -22868,10 +22870,12 @@ then :
    LIBS="$LIBS -lz"
 fi
 
-               if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
-                       :
-               else
-                       LIBS="$LIBS -l:libssp.a"
+               if echo "$host" | $GREP -i -e linux >/dev/null; then
+                       if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
+                               :
+                       else
+                               LIBS="$LIBS -l:libssp.a"
+                       fi
                fi
        fi
 fi

diff --git a/configure.ac b/configure.ac
index 648040c6d56596caff2c416c7a73529fa288bbde..21c548d4947868a747761b8478257494235d4aac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1673,10 +1673,12 @@ if test x_$enable_static_exe = x_yes; then
                        LIBS="$LIBS -lgdi32"
                fi
                AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
-               if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
-                       :
-               else
-                       LIBS="$LIBS -l:libssp.a"
+               if echo "$host" | $GREP -i -e linux >/dev/null; then
+                       if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
+                               :
+                       else
+                               LIBS="$LIBS -l:libssp.a"
+                       fi
                fi
        fi
 fi
@@ -1694,10 +1696,12 @@ if test x_$enable_fully_static = x_yes; then
                        LIBS="$LIBS -lgdi32"
                fi
                AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
-               if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
-                       :
-               else
-                       LIBS="$LIBS -l:libssp.a"
+               if echo "$host" | $GREP -i -e linux >/dev/null; then
+                       if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
+                               :
+                       else
+                               LIBS="$LIBS -l:libssp.a"
+                       fi
                fi
        fi
 fi

diff --git a/doc/Changelog b/doc/Changelog
index 88f121bc9227bdd5fb9c6045ae65771f52f02f17..02809011bc9f602a45b33877c7a37476f11ea335 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -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.