+ befbd26

Author: sobomax

docker/Dockerfile.python_wheels

@@ -23,7 +23,7 @@ ENV TROOT="/tmp/build_cache_root"
 ENV PIPCACHE_DIR="${CACHE_ROOT}/pip"
 
 RUN dnf --refresh -y makecache
-RUN dnf install -y perl perl-core clang lld
+RUN dnf install -y perl perl-core clang lld llvm
 RUN dnf install -y pv || true
 RUN dnf clean -y all
 
@@ -58,7 +58,8 @@ ENV CCACHE_COMPILERCHECK="content"
 ARG TARGETPLATFORM
 ENV SET_ENV="sh ./scripts/build/set_env.sh platformopts"
 
-RUN env -S `${SET_ENV}` \
+RUN IFS='
+' set -- `${SET_ENV}` && env -S "${@}" \
  ${PYTHON_CMD} -m build --wheel
 RUN auditwheel repair dist/*.whl --wheel-dir dist_out
 RUN make -C rtpproxy clean

python/build_rtpproxy.sh

@@ -8,7 +8,7 @@ MYDIR="`dirname ${_SELF}`"
 
 BDIR="${MYDIR}/../build"
 
-if [ "${CC}" = "clang" ]
+if ${CC} -v 2>&1 | grep -q "clang"
 then
   export AR="llvm-ar"
   export RANLIB="llvm-ranlib"
@@ -70,7 +70,8 @@ then
   then
     rm -rf ${MYDIR}/../openssl
   fi
-  if ! CFLAGS="${CFLAGS_opt}" LDFLAGS="${LDFLAGS_opt}" ./configure \
+  if ! CFLAGS="${CFLAGS_opt}" LDFLAGS="${LDFLAGS_opt}" LIBS="${SRTP_LIBS}" \
+   ./configure \
    --prefix="${BDIR}" --enable-static --disable-shared --enable-openssl \
    --with-openssl-dir="${BDIR}"
   then

scripts/build/set_env.sh

@@ -17,6 +17,10 @@ platformopts() {
     echo "CCACHE_MAXSIZE=40M"
     ;;
   esac
+  if [ -e /opt/rh/gcc-toolset-14/root/usr/lib/gcc/i686-redhat-linux/14/libatomic.a ]
+  then
+    echo 'SRTP_LIBS="-L/opt/rh/gcc-toolset-14/root/usr/lib/gcc/i686-redhat-linux/14 -l:libatomic.a"'
+  fi
   echo "SAVE_SPACE=yes"
 }