From: Anton Mitrofanov <BugMaster@narod.ru>
Date: Sat, 3 Jan 2015 12:46:19 +0000 (+0300)
Subject: Fix ARCH variable name conflict with BSD ports (bsd.port.mk) read-only variable
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b77cc09b9252d70f78726f2472391b63948d9895;p=libx264

Fix ARCH variable name conflict with BSD ports (bsd.port.mk) read-only variable
---

diff --git a/Makefile b/Makefile
index 12c74e44..37d6531e 100644
--- a/Makefile
+++ b/Makefile
@@ -87,12 +87,12 @@ X86SRC0 += sad-a.asm
 endif
 X86SRC = $(X86SRC0:%=common/x86/%)
 
-ifeq ($(ARCH),X86)
+ifeq ($(SYS_ARCH),X86)
 ARCH_X86 = yes
 ASMSRC   = $(X86SRC) common/x86/pixel-32.asm
 endif
 
-ifeq ($(ARCH),X86_64)
+ifeq ($(SYS_ARCH),X86_64)
 ARCH_X86 = yes
 ASMSRC   = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm
 endif
@@ -106,7 +106,7 @@ endif
 endif
 
 # AltiVec optims
-ifeq ($(ARCH),PPC)
+ifeq ($(SYS_ARCH),PPC)
 ifneq ($(AS),)
 SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
         common/ppc/quant.c common/ppc/deblock.c \
@@ -115,7 +115,7 @@ endif
 endif
 
 # NEON optims
-ifeq ($(ARCH),ARM)
+ifeq ($(SYS_ARCH),ARM)
 ifneq ($(AS),)
 ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
           common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
@@ -126,7 +126,7 @@ endif
 endif
 
 # AArch64 NEON optims
-ifeq ($(ARCH),AARCH64)
+ifeq ($(SYS_ARCH),AARCH64)
 ifneq ($(AS),)
 ASMSRC += common/aarch64/bitstream-a.S \
           common/aarch64/cabac-a.S     \
diff --git a/configure b/configure
index e2977bdf..2916036c 100755
--- a/configure
+++ b/configure
@@ -1211,7 +1211,7 @@ exec_prefix=$exec_prefix
 bindir=$bindir
 libdir=$libdir
 includedir=$includedir
-ARCH=$ARCH
+SYS_ARCH=$ARCH
 SYS=$SYS
 CC=$CC
 CFLAGS=$CFLAGS