Commit 6b1513c7 authored by Niklas Haas's avatar Niklas Haas

libplacebo-ubuntu-cosmic: fix installation of shaderc .so

libshaderc_shared.so is a symlink to libshaderc_shared.so.1. `install`
aggressively dereferences symlinks, so it ended up installing the .so.1
to the path of .so, which worked while resolving dependencies but broke
at link time - resulting in a failed job.

Fix this issue by just using `cp -a` instead - the permissions are
correct by default anyway.
parent fe04824b
FROM ubuntu:cosmic-20181114 FROM ubuntu:cosmic-20181114
ENV IMAGE_DATE=201812020400 ENV IMAGE_DATE=201812031700
# If someone wants to use VideoLAN docker images on a local machine and does # If someone wants to use VideoLAN docker images on a local machine and does
# not want to be disturbed by the videolan user, we should not take an uid/gid # not want to be disturbed by the videolan user, we should not take an uid/gid
...@@ -41,11 +41,10 @@ RUN set -x && \ ...@@ -41,11 +41,10 @@ RUN set -x && \
-DSHADERC_SKIP_TESTS=1 \ -DSHADERC_SKIP_TESTS=1 \
.. && \ .. && \
ninja && \ ninja && \
cd .. && \ cp -a libshaderc*/libshaderc*.a /usr/local/lib && \
install -m644 build/libshaderc*/libshaderc*.a /usr/local/lib && \ cp -a libshaderc*/libshaderc*.so* /usr/local/lib && \
install -m755 build/libshaderc*/libshaderc*.so /usr/local/lib && \ cp -a ../libshaderc*/include /usr/local && \
cp -a libshaderc*/include /usr/local && \ cd /root && \
cd .. && \
rm -rf shaderc rm -rf shaderc
COPY crossfiles/ /opt/crossfiles/ COPY crossfiles/ /opt/crossfiles/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment