add log for build armv6

lsqt68 · Apr 10, 2022 · 06dc00a · 06dc00a
1 parent 6357dfb
commit 06dc00a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -66,6 +66,8 @@ if (NOT EXISTS ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE}/args.gn)
     string(REPLACE "--enable-thumb" "--disable-thumb" filecontent "${filecontent}")
     string(REPLACE "--extra-cflags=-march=armv7-a" "--extra-cflags=-march=armv6" filecontent "${filecontent}")
     file(WRITE ${WEBRTCROOT}/src/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py "${filecontent}")
+    EXECUTE_PROCESS(COMMAND env)
+    EXECUTE_PROCESS(COMMAND which clang)
     EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/third_party/ffmpeg COMMAND python3 chromium/scripts/build_ffmpeg.py linux arm --config-only)
     EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/third_party/ffmpeg COMMAND chromium/scripts/copy_config.sh)
   endif()

diff --git a/Dockerfile b/Dockerfile
@@ -6,8 +6,8 @@ WORKDIR /webrtc-streamer
 COPY . /webrtc-streamer
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget git python3 python3-pkg-resources g++ autoconf automake libtool xz-utils libpulse-dev libasound2-dev libgtk-3-dev libxtst-dev libssl-dev cmake make pkg-config p7zip-full \
-	&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /webrtc/depot_tools \
-	&& export PATH=/webrtc/depot_tools:$PATH \
+	&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot_tools \
+	&& export PATH=/depot_tools:$PATH \
 	&& cd /webrtc \
 	&& fetch --no-history --nohooks webrtc \
 	&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -11,8 +11,8 @@ COPY . /webrtc-streamer
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates wget git python3 python3-pkg-resources xz-utils cmake make pkg-config gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
 	&& mkdir /webrtc \
-	&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /webrtc/depot_tools \
-	&& export PATH=/webrtc/depot_tools:$PATH \
+	&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot_tools \
+	&& export PATH=/depot_tools:$PATH \
 	&& cd /webrtc \
 	&& fetch --no-history --nohooks webrtc \
 	&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \

diff --git a/Dockerfile.rpi b/Dockerfile.rpi
@@ -14,8 +14,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 	&& mkdir /webrtc \
     && wget -qO- ${CROSSCOMPILER} | tar xz -C /webrtc \
 	&& export PATH=$(ls -d /webrtc/cross-pi-gcc-*/bin):$PATH \
-	&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /webrtc/depot_tools \
-	&& export PATH=/webrtc/depot_tools:$PATH \
+	&& git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot_tools \
+	&& export PATH=/depot_tools:$PATH \
 	&& cd /webrtc \
 	&& fetch --no-history --nohooks webrtc \
 	&& sed -i -e "s|'src/resources'],|'src/resources'],'condition':'rtc_include_tests==true',|" src/DEPS \