Skip to content

Commit

Permalink
gh-683: secure_random: add "atomic" dep (for openssl)
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianopol authored and rocstreaming-bot committed Feb 11, 2025
1 parent 225aeaf commit 60117ba
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
4 changes: 4 additions & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,10 @@ if meta.platform == 'darwin':
conf.FindTool('LIPO', [''], [('lipo', None)], required=False)
conf.FindTool('INSTALL_NAME_TOOL', [''], [('install_name_tool', None)], required=False)

if meta.compiler == 'gcc' or meta.compiler == 'clang':
if conf.CheckLib('atomic'):
env.AddManualDependency(libs=['atomic']) # explicitly needed by libcrypto (openssl)

meta.c11_support = False
if not GetOption('disable_c11'):
if meta.compiler == 'gcc':
Expand Down
16 changes: 14 additions & 2 deletions scripts/ci_checks/docker.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
#!/usr/bin/env bash
set -euxo pipefail
#
# This script can be run locally by user 'bob' like this:
#
# DOCKER_UID="$(id -u bob)" DOCKER_GID="$(id -g bob)" ./scripts/ci_checks/docker.sh ...
#
# (the full command line with exact arguments to docker.sh can be taken from CI)

set -eux -o pipefail

if [ -z "${CI:-}" ]; then
opts=-ti
else
opts=-t
fi

user="${DOCKER_UID:-"$UID"}"
if [ -n "${DOCKER_GID:-}" ]; then
user="$user:$DOCKER_GID"
fi

docker run --rm ${opts} \
--cap-add SYS_PTRACE \
-u "${UID}" \
-u "$user" \
-v "$(pwd)":/opt/roc \
-w /opt/roc \
-e CI="${CI:-}" \
Expand Down

0 comments on commit 60117ba

Please sign in to comment.