diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-11-04 12:39:27 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-11-04 18:17:50 +0100 |
| commit | 680355ace54a43688fcdff15d384d288cce6ff07 (patch) | |
| tree | dc5aa3b41f088e5b15fbdb812ba7a1b0d250018a | |
| parent | 77aa5c04f913718fded6d3fb4f83dfc2d065dc5b (diff) | |
vorbis: fix build for non generic arm architectures
| -rw-r--r-- | recipes/libvorbis.recipe | 13 | ||||
| -rw-r--r-- | recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch | 30 |
2 files changed, 33 insertions, 10 deletions
diff --git a/recipes/libvorbis.recipe b/recipes/libvorbis.recipe index 8ee237ee..b6a12e5c 100644 --- a/recipes/libvorbis.recipe +++ b/recipes/libvorbis.recipe @@ -12,18 +12,11 @@ class Recipe(recipe.Recipe): config_sh = 'sh autogen.sh' patches = ['libvorbis/0001-Fix-linking-on-Android.patch', 'libvorbis/0003-Link-the-other-libs-with-lm-too.patch', - 'libvorbis/0004-configure-check-for-endianness.patch'] + 'libvorbis/0004-configure-check-for-endianness.patch', + 'libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch', + ] files_libs = ['libvorbis', 'libvorbisenc', 'libvorbisfile'] files_devel = [ 'include/vorbis', 'lib/pkgconfig/vorbis.pc', 'lib/pkgconfig/vorbisenc.pc', 'lib/pkgconfig/vorbisfile.pc'] - - def configure(self): - if self.config.target_platform == Platform.IOS: - if self.config.target_arch in [Architecture.ARM, Architecture.ARMv7]: - # These optimizations make the linker think the object file is not - # for the arm architecture - shell.replace (os.path.join(self.build_dir, 'configure'), - {'-O4': '-O2', '-force_cpusubtype_ALL': ' '}) - super(recipe.Recipe, self).configure() diff --git a/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch b/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch new file mode 100644 index 00000000..6153da70 --- /dev/null +++ b/recipes/libvorbis/0005-darwin-do-not-build-for-a-generic-arm-architecture.patch @@ -0,0 +1,30 @@ +From dded9c5c30cf45320541c27e444d9150b04e6ab5 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <ylatuya@gmail.com> +Date: Mon, 4 Nov 2013 12:15:10 +0100 +Subject: [PATCH] darwin: do not build for a generic arm architecture + +These linker flags end up building for generic arm when armv7 is required +--- + configure.ac | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 953107d..a5c0f88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -198,9 +198,9 @@ else + CFLAGS="-O20 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" + PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;; + *-*-darwin*) +- DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char" +- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char" +- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";; ++ DEBUG="-DDARWIN -fno-common -Wall -g -O0 -fsigned-char" ++ CFLAGS="-DDARWIN -fno-common -Wall -g -O2 -ffast-math -fsigned-char" ++ PROFILE="-DDARWIN -fno-common -Wall -g -pg -O2 -ffast-math -fsigned-char";; + *-*-os2*) + # Use -W instead of -Wextra because gcc on OS/2 is an old version. + DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" +-- +1.7.4.4 + |