Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions ci_build_images/msan.instrumentedlibs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ if [ "${VERSION_CODENAME}" = trixie ]; then
fi
apt-get source unixodbc-dev
mv unixodbc-*/* .
if [ "${VERSION_CODENAME}" = trixie ]; then
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1136221
# awaiting arrival on Debian stable.
curl https://github.com/lurcher/unixODBC/commit/447ca7624394f8cc9825c6ac3ff60e3715831b87.patch | patch -p1
fi
libtoolize --force
aclocal
autoheader
Expand All @@ -110,7 +115,7 @@ automake --add-missing
./configure --enable-fastvalidate --with-pth=no --with-included-ltdl=yes
make -j "$(nproc)"
find .
mv ./DriverManager/.libs/libodbc.so* ./odbcinst/.libs/libodbcinst.so* "$MSAN_LIBDIR"
mv ./cur/.libs/libodbccr* ./DriverManager/.libs/libodbc.so* ./odbcinst/.libs/libodbcinst.so* "$MSAN_LIBDIR"
rm -rf -- *

##libltdl - C/ODBC
Expand Down Expand Up @@ -201,10 +206,27 @@ rm -rf -- *
# shellcheck disable=SC2094
/usr/sbin/cracklib-packer /usr/share/dict/cracklib-small < /usr/share/dict/cracklib-small

# libnghttp2, a curl dependency. Shows up in s3 tests
apt-get source nghttp2
mv nghttp2-*/* .
autoreconf --install .
./configure --without-libcares
make -j "$(nproc)"
mv lib/.libs/*.so* "$MSAN_LIBDIR"
rm -rf -- *

# curl
apt-get source curl
mv curl*/* .
./configure --with-openssl --enable-ipv6 --disable-static --enable-websockets
if [ "${VERSION_CODENAME}" = trixie ]; then
# extras from debian/rules
# ./storage/maria/ha_s3.so: /msan-libs/libcurl.so.4: no version information available (required by ./storage/maria/ha_s3.so)
./configure --with-openssl --enable-ipv6 --disable-static --enable-websockets \
--disable-symbol-hiding --enable-versioned-symbols --enable-threaded-resolver
else
# keeping old stable - stable
./configure --with-openssl --enable-ipv6 --disable-static --enable-websockets
fi
make -j "$(nproc)"
mv ./lib/.libs/*.so* "$MSAN_LIBDIR"
rm -rf -- *
Expand Down