]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Match multiple ARM architecture name variants in Makefile.ffmpeg copilot/migrate-aarch64-arm7-to-native-arm 1988/head
authorcopilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Tue, 4 Nov 2025 16:00:25 +0000 (16:00 +0000)
committercopilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Tue, 4 Nov 2025 16:00:25 +0000 (16:00 +0000)
Co-authored-by: Flole998 <9951871+Flole998@users.noreply.github.com>
Makefile.ffmpeg

index dadd0076cb0c1b095f3b25453398eeae26db42c1..d3d8fd51dde50fb8a58134f2188e72f5c7ca3679 100644 (file)
@@ -24,13 +24,15 @@ FFMPEG_HOST   := $(ARCH)-linux-gnu
 FFMPEG_TARGET := x86-linux-gcc
 endif
 
-ifeq ($(ARCH),armhf)
+# Match various ARM 32-bit architecture names
+ifneq (,$(filter armhf armv7 armv7l arm,$(ARCH)))
 FFMPEG_HOST   := arm-linux-gnueabihf
 FFMPEG_ARCH   := armv7
 FFMPEG_CPU    := armv7-a
 endif
 
-ifeq ($(ARCH),arm64)
+# Match various ARM 64-bit architecture names
+ifneq (,$(filter arm64 aarch64,$(ARCH)))
 FFMPEG_HOST   := aarch64-linux-gnu
 FFMPEG_ARCH   := aarch64
 FFMPEG_CPU    := armv8-a