diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2015-10-24 21:30:21 +0200 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2015-10-24 21:39:59 +0200 |
| commit | 151099500341bf5903a1218e4fa768afc89ff6d3 (patch) | |
| tree | ea152a06522c7b54e8a6dfe23f5a0b980bdf2e09 | |
| parent | 3827797a1d7393487bf6c617a79602a7d0ec4874 (diff) | |
spandsp: add patch to stop compiling some conflicting has_MMX/has_3DNow/etc symbols
Because they conflict with libmp3lame symbols when we link
everything statically for mobile targets
https://bugzilla.gnome.org/show_bug.cgi?id=756882
| -rw-r--r-- | recipes/spandsp.recipe | 2 | ||||
| -rw-r--r-- | recipes/spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/recipes/spandsp.recipe b/recipes/spandsp.recipe index 7b4acf65..9c982de2 100644 --- a/recipes/spandsp.recipe +++ b/recipes/spandsp.recipe @@ -9,7 +9,7 @@ class Recipe(recipe.Recipe): licenses = [License.LGPLv2_1Plus] deps = ['tiff'] allow_parallel_build = False - patches = [] + patches = [ 'spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch' ] files_libs = ['libspandsp'] files_devel = ['include/spandsp', 'include/spandsp.h', 'lib/pkgconfig/spandsp.pc'] diff --git a/recipes/spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch b/recipes/spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch new file mode 100644 index 00000000..99ac76c0 --- /dev/null +++ b/recipes/spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch @@ -0,0 +1,34 @@ +From 4f279d35599b265be9f9c140759dda684ed47818 Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis <george.kiagiadakis@collabora.com> +Date: Sat, 24 Oct 2015 19:23:58 +0000 +Subject: [PATCH] spandsp: do not compile has_X86FEATURE symbols + +They conflict with libmp3lame +--- + src/testcpuid.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/testcpuid.c b/src/testcpuid.c +index 2344c59..d3f77d7 100644 +--- a/src/testcpuid.c ++++ b/src/testcpuid.c +@@ -35,6 +35,8 @@ + /* Make this file just disappear if we are not on an x86 machine */ + #if defined(__i386__) // || defined(__x86_64__) + ++#if defined(TESTBED) ++ + enum + { + X86_EFLAGS_CF = 0x00000001, /* Carry Flag */ +@@ -188,7 +190,6 @@ int has_3DNow(void) + } + /*- End of function --------------------------------------------------------*/ + +-#if defined(TESTBED) + int main(int argc, char *argv[]) + { + int result; +-- +2.4.3 + |