From 553d8b675713f33ccce1dfe7e9852f9fc0009f3e Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Sun, 11 Jun 2023 21:57:03 -0400
Subject: [PATCH] bring aarch64 in line, revert local test makeflag

---
 Dockerfile         |  2 +-
 Dockerfile.aarch64 | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5f96c1a..433841e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG FFMPEG_VERSION
 # common env
 ENV \
   DEBIAN_FRONTEND="noninteractive" \
-  MAKEFLAGS="-j8"
+  MAKEFLAGS="-j4"
 
 # versions
 ENV \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 9ed180c..afb7e0e 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -420,17 +420,18 @@ RUN \
 RUN \
   echo "**** arrange files ****" && \
   ldconfig && \
-  mkdir -p /buildout/usr/local/bin && \
+  mkdir -p \
+    /buildout/usr/local/bin \
+    /buildout/usr/local/lib && \
   cp \
     /tmp/ffmpeg/ffmpeg \
     /buildout/usr/local/bin && \
   cp \
     /tmp/ffmpeg/ffprobe \
     /buildout/usr/local/bin && \
-  mkdir -p /buildout/usr/lib && \
-  ldd /tmp/ffmpeg/ffmpeg \
-    | awk '/local/ {print $3}' \
-    | xargs -i cp -L {} /buildout/usr/lib/
+  cp -a \
+    /usr/local/lib/lib* \
+    /buildout/usr/local/lib/
 
 # Storage layer consumed downstream
 FROM scratch