From 01a8700b283c2255c2c9000431df645e79c028cc Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Feb 13 2014 16:34:54 +0000 Subject: working hacks for armv7hl --- diff --git a/libvpx.spec b/libvpx.spec index cba6c84..a3bf064 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -6,7 +6,7 @@ Name: libvpx Summary: VP8 Video Codec SDK Version: %{majorver}.%{minorver}.%{tinyver} %global soversion %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Libraries Source0: http://webm.googlecode.com/files/%{name}-v%{version}.tar.bz2 @@ -51,9 +51,13 @@ and decoder. %ifarch x86_64 %global vpxtarget x86_64-linux-gcc %else +%ifarch armv7hl +%global vpxtarget armv7-linux-gcc +%else %global vpxtarget generic-gnu %endif %endif +%endif # The configure script will reject the shared flag on the generic target # This means we need to fall back to the manual creation we did before. :P @@ -63,7 +67,12 @@ and decoder. %global generic_target 0 %endif -./configure --target=%{vpxtarget} --enable-pic --disable-install-srcs \ +%ifarch armv7hl +CROSS=armv7hl-redhat-linux-gnueabi- CHOST=armv7hl-redhat-linux-gnueabi-hardfloat ./configure \ +%else +./configure --target=%{vpxtarget} \ +%endif +--enable-pic --disable-install-srcs \ %if ! %{generic_target} --enable-shared \ %endif @@ -74,6 +83,21 @@ sed -i "s|-O3|%{optflags}|g" libs-%{vpxtarget}.mk sed -i "s|-O3|%{optflags}|g" examples-%{vpxtarget}.mk sed -i "s|-O3|%{optflags}|g" docs-%{vpxtarget}.mk +%ifarch armv7hl +#hackety hack hack +sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" libs-%{vpxtarget}.mk +sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" examples-%{vpxtarget}.mk +sed -i "s|AR=armv7hl-redhat-linux-gnueabi-ar|AR=ar|g" docs-%{vpxtarget}.mk + +sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" libs-%{vpxtarget}.mk +sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" examples-%{vpxtarget}.mk +sed -i "s|AS=armv7hl-redhat-linux-gnueabi-as|AS=as|g" docs-%{vpxtarget}.mk + +sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" libs-%{vpxtarget}.mk +sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" examples-%{vpxtarget}.mk +sed -i "s|NM=armv7hl-redhat-linux-gnueabi-nm|NM=nm|g" docs-%{vpxtarget}.mk +%endif + make %{?_smp_mflags} verbose=true target=libs %if %{generic_target} @@ -145,6 +169,9 @@ popd %{_bindir}/* %changelog +* Tue Feb 11 2014 Tom Callaway - 1.3.0-2 +- armv7hl specific target + * Tue Feb 11 2014 Tom Callaway - 1.3.0-1 - update to 1.3.0