Restored STB detection
This commit is contained in:
+4
-10
@@ -1,12 +1,5 @@
|
||||
|
||||
FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
|
||||
|
||||
FROM --platform=$BUILDPLATFORM alpine:3.14
|
||||
ARG TARGETPLATFORM
|
||||
|
||||
WORKDIR /tmp/workdir
|
||||
|
||||
ARG PREFIX="/tmp/install"
|
||||
|
||||
ARG BUILD_PACKAGES="\
|
||||
clang \
|
||||
@@ -14,7 +7,6 @@ ARG BUILD_PACKAGES="\
|
||||
cmake \
|
||||
lld \
|
||||
curl \
|
||||
tree \
|
||||
pkgconfig"
|
||||
|
||||
RUN apk add --no-cache ${BUILD_PACKAGES}
|
||||
@@ -30,11 +22,13 @@ ARG LMS_BUILD_PACKAGES=" \
|
||||
wt-dev \
|
||||
gtest-dev"
|
||||
|
||||
# copy xx scripts to your build stage
|
||||
COPY --from=xx / /
|
||||
|
||||
ARG TARGETPLATFORM
|
||||
RUN xx-apk add --no-scripts --no-cache ${LMS_BUILD_PACKAGES}
|
||||
|
||||
ARG PREFIX="/tmp/install"
|
||||
|
||||
# STB
|
||||
ARG STB_VERSION=b42009b3b9d4ca35bc703f5310eedc74f584be58
|
||||
RUN \
|
||||
@@ -50,7 +44,7 @@ ARG LMS_BUILD_TYPE="Release"
|
||||
RUN \
|
||||
DIR=/tmp/lms/build && mkdir -p ${DIR} && cd ${DIR} && \
|
||||
xx-info is-cross && export BUILD_TESTS=OFF || export BUILD_TESTS=ON && \
|
||||
PKG_CONFIG_PATH=/$(xx-info)/usr/lib/pkgconfig CXXFLAGS="-I${PREFIX}/include" cmake /tmp/lms/ -DCMAKE_BUILD_TYPE=${LMS_BUILD_TYPE} $(xx-clang --print-cmake-defines) -DCMAKE_PREFIX_PATH=/$(xx-info)/usr/lib/cmake -DBUILD_TESTING=${BUILD_TESTS} && \
|
||||
PKG_CONFIG_PATH=/$(xx-info)/usr/lib/pkgconfig cmake /tmp/lms/ -DCMAKE_INCLUDE_PATH=${PREFIX}/include -DCMAKE_BUILD_TYPE=${LMS_BUILD_TYPE} $(xx-clang --print-cmake-defines) -DCMAKE_PREFIX_PATH=/$(xx-info)/usr/lib/cmake -DBUILD_TESTING=${BUILD_TESTS} && \
|
||||
VERBOSE=1 make -j$(nproc) && \
|
||||
xx-verify src/lms/lms && \
|
||||
xx-info is-cross || make test
|
||||
|
||||
Reference in New Issue
Block a user