From c5586151d62b0cd5b2be8cb0753836817e172706f469c245ce129f6127eef6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 15 Oct 2011 13:27:27 +0000 Subject: [PATCH] revert and add real armv7l arhc OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvpx?expand=0&rev=35 --- libvpx-configure-add-armv7-tgt-isa.patch | 11 +++++++---- libvpx.spec | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libvpx-configure-add-armv7-tgt-isa.patch b/libvpx-configure-add-armv7-tgt-isa.patch index c897f59..4dd8695 100644 --- a/libvpx-configure-add-armv7-tgt-isa.patch +++ b/libvpx-configure-add-armv7-tgt-isa.patch @@ -11,15 +11,18 @@ Index: libvpx-v0.9.7-p1/build/make/configure.sh else CROSS=${CROSS:-arm-none-linux-gnueabi-} fi -@@ -670,8 +672,10 @@ process_common_toolchain() { +@@ -670,8 +672,13 @@ process_common_toolchain() { check_add_asflags -mcpu=${tgt_isa} elif enabled armv7 then - check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize - check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a -+ if [[ "$(uname -m)" != $tgt_isa* ]]; then -+ check_add_cflags -march=armv7-a -mcpu=cortex-a8 #-ftree-vectorize -+ check_add_asflags -mcpu=cortex-a8 #-march=armv7-a ++ if [[ "$(uname -m)" == $tgt_isa* ]]; then ++ check_add_cflags -mfpu=neon ++ check_add_asflags -mfpu=neon ++ else ++ check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize ++ check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a + fi else check_add_cflags -march=${tgt_isa} diff --git a/libvpx.spec b/libvpx.spec index 40d84d2..2d45168 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -104,7 +104,10 @@ export CFLAGS="%{optflags}" --libdir=%{_libdir} \ --enable-debug \ --enable-shared \ +%ifarch armv7l armv7hl + --target=armv7-linux-gcc \ --enable-runtime-cpu-detect \ +%endif --enable-pic make %{?_smp_mflags}