Skip to content
Snippets Groups Projects
Commit f62c68ec0e93 authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch 'sh-fix-issue-7672' into 'master'

Disable zstd decompression support with libmagic

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6749



Merged-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Approved-by: default avatarRobert Marshall <rmarshall@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!92Merging upstream 15.10.0+ce.0
......@@ -99,6 +99,9 @@
bundle 'config build.gpgme --use-system-libraries', env: env
bundle "config build.nokogiri --use-system-libraries --with-xml2-include=#{install_dir}/embedded/include/libxml2 --with-xslt-include=#{install_dir}/embedded/include/libxslt", env: env
bundle 'config build.grpc --with-ldflags=-Wl,--no-as-needed --with-dldflags=-latomic', env: env if OhaiHelper.os_platform == 'raspbian'
# Disable zstd decompression support to avoid linking against libzstd,
# which may not be a safe system dependency to use.
bundle 'config build.ruby-magic --with-magic-flags=--disable-zstdlib', env: env
bundle "config set --local frozen 'true'"
bundle "install --without #{bundle_without.join(' ')} --jobs #{workers} --retry 5", env: env
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment