Build in centos7 and ensure libaom not installed in lib64

Author: viasatfinn

Dockerfile-centos

@@ -0,0 +1,26 @@
+ARG CLEANUP="yes"
+FROM centos:7 AS base
+ARG MAKE_DOCS="no"
+
+RUN yum update -y && \
+    yum install -y autoconf automake bzip2 bzip2-devel freetype-devel gcc gcc-c++ git libtool make mercurial && \
+    yum install -y vim
+
+#      yum install autoconf automake bzip2 bzip2-devel cmake freetype-devel gcc gcc-c++ git libtool make mercurial pkgconfig zlib-devel
+
+WORKDIR /app
+COPY ./build-ffmpeg /app/build-ffmpeg
+
+RUN STOP_BEFORE_CMAKE=yes /app/build-ffmpeg --build
+RUN SKIP_FFMPEG_BUILD=yes /app/build-ffmpeg --build
+RUN AUTOINSTALL=yes /app/build-ffmpeg --build  # toggle comment to trigger layer rebuild
+RUN cp /app/workspace/bin/ffmpeg /app/workspace/bin/ffprobe /usr/bin/
+
+FROM base as cleanup-no
+FROM base as cleanup-yes
+RUN /app/build-ffmpeg --cleanup
+
+FROM cleanup-${CLEANUP} AS final
+
+CMD         ["--help"]
+ENTRYPOINT  ["/usr/bin/ffmpeg"]

build-ffmpeg

@@ -296,6 +296,10 @@ if build "pkg-config"; then
 	build_done "pkg-config"
 fi
 
+if [[ $STOP_BEFORE_CMAKE == "yes" ]]; then
+  exit 0
+fi
+
 if build "cmake"; then
 	download "https://cmake.org/files/v3.15/cmake-3.15.4.tar.gz" "cmake-3.15.4.tar.gz"
 	cd "$PACKAGES"/cmake-3.15.4  || exit
@@ -343,7 +347,7 @@ if build "av1"; then
 	cd "$PACKAGES"/av1 || exit
 	mkdir -p "$PACKAGES"/aom_build
 	cd "$PACKAGES"/aom_build || exit
-	execute cmake -DENABLE_TESTS=0 -DCMAKE_INSTALL_PREFIX:PATH="${WORKSPACE}" "$PACKAGES"/av1
+	execute cmake -DENABLE_TESTS=0 -DCMAKE_INSTALL_PREFIX:PATH="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib "$PACKAGES"/av1
 	execute make -j $MJOBS
 	execute make install
 	build_done "av1"