[sr-dev] git:5.0:ae2b828b: Makefile.defs: explicit retarget of amd64 arch to x86_64

[Daniel-Constantin Mierla]

Module: kamailio
Branch: 5.0
Commit: ae2b828b49cd3aaa771a81b4c6b8893d9bad619f
URL: https://github.com/kamailio/kamailio/commit/ae2b828b49cd3aaa771a81b4c6b8893d9bad619f

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-03-15T13:30:51+01:00

Makefile.defs: explicit retarget of amd64 arch to x86_64

- it is supposed to be done by the arch detection scripts, but it may
  fail on various systems having a different output than expected

(cherry picked from commit 2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c)

---

Modified: src/Makefile.defs

---

Diff:  https://github.com/kamailio/kamailio/commit/ae2b828b49cd3aaa771a81b4c6b8893d9bad619f.diff
Patch: https://github.com/kamailio/kamailio/commit/ae2b828b49cd3aaa771a81b4c6b8893d9bad619f.patch

---

diff --git a/src/Makefile.defs b/src/Makefile.defs
index 442e05d..8c20bd8 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -374,6 +374,12 @@ ARCH:=$(CC_ARCH)
 else
 ARCH:=$(HOST_ARCH)
 endif
+
+# retarget amd64 to x86_64
+ifeq ($(ARCH), amd64)
+	ARCH=x86_64
+endif
+
 $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)
 
 LIBDIR ?=
@@ -788,10 +794,6 @@ ifeq ($(ARCH), x86_64)
 	use_fast_lock=yes
 endif
 
-ifeq ($(ARCH), amd64)
-	use_fast_lock=yes
-endif
-
 ifeq ($(ARCH), sparc64)
 ifeq 	($(CC_NAME), gcc)
 	use_fast_lock=yes