From: Ondřej Surý <ondrej@isc.org>
Date: Thu, 15 Aug 2024 17:54:58 +0000 (+0200)
Subject: For TSAN builds, use libraries from /opt/tsan
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1f88ccc15d833aa1806623ea86c6f96b46d91df;p=thirdparty%2Fbind9.git

For TSAN builds, use libraries from /opt/tsan

The new TSAN images, the TSAN-enabled images install libraries to
/opt/tsan, synchronize the configure options and CFLAGS between gcc:tsan
and clang:tsan images and set the PKG_CONFIG_PATH to /opt/tsan/lib.

(cherry picked from commit 2a46396f295146b3868d89c8d8136fd3574579e5)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78d4fa8d88b..fb4b7ea67df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1053,9 +1053,9 @@ unit:clang:asan:
 gcc:tsan:
   variables:
     CC: gcc
-    CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0 -Wl,-rpath=/usr/local/lib -Wl,--enable-new-dtags"
+    CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock PKG_CONFIG_PATH=/usr/local/lib/pkgconfig"
+    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
   <<: *tsan_fedora_40_amd64_image
   <<: *build_job
 
@@ -1082,9 +1082,9 @@ clang:tsan:
   <<: *build_job
   variables:
     CC: "${CLANG}"
-    CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
+    CFLAGS: "${CFLAGS_COMMON} -ggdb -O2 -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock"
+    EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
 
 system:clang:tsan:
   variables:
@@ -1430,7 +1430,7 @@ respdiff:tsan:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--enable-pthread-rwlock"
+    EXTRA_CONFIGURE: "--enable-pthread-rwlock PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.1"
     TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
     RESPDIFF_JOBS: 32