Enable RPC builds and merge PR 15405 across Dockerfiles

toolboxes/Dockerfile.rocm-7rc

@@ -55,12 +55,17 @@ RUN printf '%s\n' \
 WORKDIR /opt/llama.cpp
 RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git . \
  && git clean -xdf \
+ && git config user.email "builder@localhost" \
+ && git config user.name "Container Builder" \
+ && git fetch origin pull/15405/head:pr-15405 \
+ && git merge --no-edit pr-15405 \
  && git submodule update --recursive
 
 RUN cmake -S . -B build \
           -DGGML_HIP=ON \
           -DAMDGPU_TARGETS=gfx1151 \
           -DCMAKE_BUILD_TYPE=Release \
+          -DGGML_RPC=ON \
           -DLLAMA_HIP_UMA=ON \
  && cmake --build build --config Release -- -j$(nproc) \
  && cmake --install build --config Release