Drop unsupported configure options

The --enable-pthread-rwlock and --enable-mutex-atomics switches for
./configure are not available in BIND 9.11.  Do not attempt using them
in GitLab CI.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f02a820d8aa22ea3557b9bd95fcb84a48af7f2a6..b5a12927b6802b99067c6a8f626425f67a6b3280 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1007,7 +1007,7 @@ gcc:tsan:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock"
+    EXTRA_CONFIGURE: "--with-libidn2"
 
 system:gcc:tsan:
   variables:
@@ -1034,7 +1034,7 @@ clang:tsan:
     CC: "${CLANG}"
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock"
+    EXTRA_CONFIGURE: "--with-libidn2"
 
 system:clang:tsan:
   variables:
@@ -1063,7 +1063,7 @@ gcc:tsan:noatomics:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --disable-atomic"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-atomic"
 
 system:gcc:tsan:noatomics:
   variables:
@@ -1090,7 +1090,7 @@ clang:tsan:noatomics:
     CC: "${CLANG}"
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --disable-atomic"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-atomic"
 
 system:clang:tsan:noatomics:
   variables:
@@ -1115,7 +1115,7 @@ gcc:mutexatomics:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -DISC_MEM_USE_INTERNAL_MALLOC=0"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-mutex-atomics"
+    EXTRA_CONFIGURE: "--with-libidn2"
   <<: *base_image
   <<: *build_job