diff options
Diffstat (limited to 'meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch')
| -rw-r--r-- | meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch index 087a448eec..cb771fb0bf 100644 --- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch +++ b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch @@ -1,4 +1,4 @@ -From 66b120079fb21ed38cab0900c63360b0a7853eaa Mon Sep 17 00:00:00 2001 +From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001 From: Christopher Larson <chris_larson@mentor.com> Date: Tue, 13 Dec 2016 14:22:32 -0700 Subject: [PATCH] Fix X32 build by disabling asm @@ -12,15 +12,16 @@ doesn't successfully build at this time, and my assembly is very rusty. Upstream-Status: Pending Signed-off-by: Christopher Larson <chris_larson@mentor.com> + --- configure | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 3109ec4..844aeae 100755 +index 51b128d..6ea9469 100755 --- a/configure +++ b/configure -@@ -703,7 +703,13 @@ case $host_cpu in +@@ -754,7 +754,13 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" stack_alignment=16 @@ -33,9 +34,9 @@ index 3109ec4..844aeae 100755 + fi + fi if [ "$SYS" = MACOSX ]; then - ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX" + ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" if cc_check '' "-arch x86_64"; then -@@ -722,7 +728,11 @@ case $host_cpu in +@@ -773,7 +779,11 @@ case $host_cpu in RCFLAGS="--target=pe-x86-64 $RCFLAGS" fi else @@ -48,6 +49,3 @@ index 3109ec4..844aeae 100755 fi ;; powerpc*) --- -2.8.0 - |