[vlc-devel] [PATCH v2 4/9] contrib: fix cross-compile for x86_64

[Thomas Guillem]

---
 contrib/src/ffmpeg/rules.mak   | 7 +++++++
 contrib/src/gcrypt/rules.mak   | 2 +-
 contrib/src/postproc/rules.mak | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 9ddcd83..0f65976 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -93,6 +93,13 @@ FFMPEGCONF += --arch=x86
 endif
 endif
 
+# x86_64 stuff
+ifeq ($(ARCH),x86_64)
+ifndef HAVE_DARWIN_OS
+FFMPEGCONF += --arch=x86_64
+endif
+endif
+
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 0cc1222..49f242d 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -37,7 +37,7 @@ GCRYPT_CONF += --disable-asm --disable-aesni-support
 endif
 endif
 ifdef HAVE_ANDROID
-ifeq ($(ANDROID_ABI), x86)
+ifneq ($(filter $(ANDROID_ABI), x86, x86_64),)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=no
 endif
 endif
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 27e0b74..27b3929 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -45,6 +45,11 @@ ifeq ($(ARCH),i386)
 POSTPROCCONF += --arch=x86
 endif
 
+# x86_64 stuff
+ifeq ($(ARCH),x86_64)
+POSTPROCCONF += --arch=x64_64
+endif
+
 # Darwin
 ifdef HAVE_DARWIN_OS
 POSTPROCCONF += --arch=$(ARCH) --target-os=darwin
-- 
2.1.0