diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-19 23:59:23 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-20 00:00:19 +0530 |
| commit | 9dc2a514771fabc039ae7f14e06fe0ee14a83cef (patch) | |
| tree | 638559e702360409d5ee3eea933498569700f300 | |
| parent | ce68b1ba6ecc19a3acec5b711716a99486d99b90 (diff) | |
sbc.recipe: Don't use NEON on arm64 with Clang
Fixes a build failure on OS X for iOS-universal (arm64).
Also remove an unused and useless patch.
| -rw-r--r-- | recipes/sbc.recipe | 3 | ||||
| -rw-r--r-- | recipes/sbc/0002-Don-t-use-NEON-with-aarch64-on-Clang.patch | 25 | ||||
| -rw-r--r-- | recipes/sbc/0002-Don-t-use-version-script-on-all-platforms.patch | 28 |
3 files changed, 27 insertions, 29 deletions
diff --git a/recipes/sbc.recipe b/recipes/sbc.recipe index 98ffe25e..5a6590e7 100644 --- a/recipes/sbc.recipe +++ b/recipes/sbc.recipe @@ -9,7 +9,8 @@ class Recipe(recipe.Recipe): files_libs = ['libsbc'] files_devel = ['include/sbc/sbc.h', 'lib/pkgconfig/sbc.pc'] configure_options = '--disable-tester --disable-tools' - patches = ['sbc/0001-sbc-Use-stdint.h.patch'] + patches = ['sbc/0001-sbc-Use-stdint.h.patch', + 'sbc/0002-Don-t-use-NEON-with-aarch64-on-Clang.patch'] def compile(self): if self.config.target_platform != Platform.LINUX: diff --git a/recipes/sbc/0002-Don-t-use-NEON-with-aarch64-on-Clang.patch b/recipes/sbc/0002-Don-t-use-NEON-with-aarch64-on-Clang.patch new file mode 100644 index 00000000..aa6dc114 --- /dev/null +++ b/recipes/sbc/0002-Don-t-use-NEON-with-aarch64-on-Clang.patch @@ -0,0 +1,25 @@ +From 7ee8b35e86bc6ab485413615742dc64abe00b3fa Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Wed, 19 Oct 2016 23:56:42 +0530 +Subject: [PATCH] Don't use NEON with aarch64 on Clang + +Clang hasn't implemented vmov, vadd, vld, etc for aarch64. +--- + sbc/sbc_primitives_neon.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sbc/sbc_primitives_neon.h b/sbc/sbc_primitives_neon.h +index ea3da06..e3fd3d0 100644 +--- a/sbc/sbc_primitives_neon.h ++++ b/sbc/sbc_primitives_neon.h +@@ -30,6 +30,7 @@ + #include "sbc_primitives.h" + + #if defined(__GNUC__) && defined(__ARM_NEON__) && \ ++ !(defined(__clang__) && defined(__aarch64__)) && \ + !defined(SBC_HIGH_PRECISION) && (SCALE_OUT_BITS == 15) + + #define SBC_BUILD_WITH_NEON_SUPPORT +-- +2.8.4 (Apple Git-73) + diff --git a/recipes/sbc/0002-Don-t-use-version-script-on-all-platforms.patch b/recipes/sbc/0002-Don-t-use-version-script-on-all-platforms.patch deleted file mode 100644 index adfd45d8..00000000 --- a/recipes/sbc/0002-Don-t-use-version-script-on-all-platforms.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 67e8b58614c0434cd90be1c0341f2a8d7340efff Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan <nirbheek@centricular.com> -Date: Tue, 18 Oct 2016 20:04:18 +0530 -Subject: [PATCH] Don't use --version-script on all platforms - -In this patch we just disable it, and apply the patch conditionally ---- - Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ba0ab46..590348e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -26,8 +26,8 @@ lib_LTLIBRARIES = sbc/libsbc.la - sbc_libsbc_la_SOURCES = $(sbc_headers) $(sbc_sources) - - sbc_libsbc_la_LDFLAGS = -no-undefined \ -- -version-info $(SBC_CURRENT):$(SBC_REVISION):$(SBC_AGE) \ -- -Wl,--version-script=$(top_srcdir)/sbc/sbc.sym -+ -version-info $(SBC_CURRENT):$(SBC_REVISION):$(SBC_AGE) -+# -Wl,--version-script=$(top_srcdir)/sbc/sbc.sym - - sbc_libsbc_la_DEPENDENCIES = sbc/sbc.sym - --- -2.8.4 (Apple Git-73) - |