Drop 32 bit arm support
Fedora no longer builds 32 bit arm packages.
This commit is contained in:
		
							parent
							
								
									e46d8ea8f4
								
							
						
					
					
						commit
						071459a204
					
				
							
								
								
									
										35
									
								
								libvpx.spec
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								libvpx.spec
									
									
									
									
									
								
							@ -56,9 +56,6 @@ and decoder.
 | 
				
			|||||||
%ifarch	x86_64
 | 
					%ifarch	x86_64
 | 
				
			||||||
%global	vpxtarget x86_64-linux-gcc
 | 
					%global	vpxtarget x86_64-linux-gcc
 | 
				
			||||||
%else
 | 
					%else
 | 
				
			||||||
%ifarch armv7hl
 | 
					 | 
				
			||||||
%global vpxtarget armv7-linux-gcc
 | 
					 | 
				
			||||||
%else
 | 
					 | 
				
			||||||
%ifarch aarch64
 | 
					%ifarch aarch64
 | 
				
			||||||
%global vpxtarget arm64-linux-gcc
 | 
					%global vpxtarget arm64-linux-gcc
 | 
				
			||||||
%else
 | 
					%else
 | 
				
			||||||
@ -66,7 +63,6 @@ and decoder.
 | 
				
			|||||||
%endif
 | 
					%endif
 | 
				
			||||||
%endif
 | 
					%endif
 | 
				
			||||||
%endif
 | 
					%endif
 | 
				
			||||||
%endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# History: The configure script used to reject the shared flag on the generic target.
 | 
					# History: The configure script used to reject the shared flag on the generic target.
 | 
				
			||||||
# This meant that we needed to fall back to manual shared lib creation.
 | 
					# This meant that we needed to fall back to manual shared lib creation.
 | 
				
			||||||
@ -82,14 +78,7 @@ and decoder.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
%set_build_flags
 | 
					%set_build_flags
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%ifarch armv7hl
 | 
					 | 
				
			||||||
CROSS=armv7hl-redhat-linux-gnueabi- CHOST=armv7hl-redhat-linux-gnueabi-hardfloat ./configure \
 | 
					 | 
				
			||||||
%else
 | 
					 | 
				
			||||||
./configure --target=%{vpxtarget} \
 | 
					./configure --target=%{vpxtarget} \
 | 
				
			||||||
%endif
 | 
					 | 
				
			||||||
%ifarch %{arm}
 | 
					 | 
				
			||||||
--disable-neon --disable-neon_asm \
 | 
					 | 
				
			||||||
%endif
 | 
					 | 
				
			||||||
--enable-pic --disable-install-srcs \
 | 
					--enable-pic --disable-install-srcs \
 | 
				
			||||||
--enable-vp9-decoder --enable-vp9-encoder \
 | 
					--enable-vp9-decoder --enable-vp9-encoder \
 | 
				
			||||||
--enable-experimental \
 | 
					--enable-experimental \
 | 
				
			||||||
@ -101,21 +90,6 @@ CROSS=armv7hl-redhat-linux-gnueabi- CHOST=armv7hl-redhat-linux-gnueabi-hardfloat
 | 
				
			|||||||
--enable-install-srcs \
 | 
					--enable-install-srcs \
 | 
				
			||||||
--prefix=%{_prefix} --libdir=%{_libdir} --size-limit=16384x16384
 | 
					--prefix=%{_prefix} --libdir=%{_libdir} --size-limit=16384x16384
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%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_build verbose=true
 | 
					%make_build verbose=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Manual shared library creation
 | 
					# Manual shared library creation
 | 
				
			||||||
@ -144,10 +118,6 @@ rm -rf tmp
 | 
				
			|||||||
# mv libNOTvpx_g.a libvpx_g.a
 | 
					# mv libNOTvpx_g.a libvpx_g.a
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%install
 | 
					%install
 | 
				
			||||||
%ifarch armv7hl
 | 
					 | 
				
			||||||
export CROSS=armv7hl-redhat-linux-gnueabi-
 | 
					 | 
				
			||||||
export CHOST=armv7hl-redhat-linux-gnueabi-hardfloat
 | 
					 | 
				
			||||||
%endif
 | 
					 | 
				
			||||||
make DIST_DIR=%{buildroot}%{_prefix} dist
 | 
					make DIST_DIR=%{buildroot}%{_prefix} dist
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Simpler to label the dir as %%doc.
 | 
					# Simpler to label the dir as %%doc.
 | 
				
			||||||
@ -182,9 +152,6 @@ chmod 755 .%{_bindir}/*
 | 
				
			|||||||
popd
 | 
					popd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Get the vpx_config.h file
 | 
					# Get the vpx_config.h file
 | 
				
			||||||
%ifarch %{arm}
 | 
					 | 
				
			||||||
cp -a vpx_config.h %{buildroot}%{_includedir}/vpx/vpx_config-arm.h
 | 
					 | 
				
			||||||
%else
 | 
					 | 
				
			||||||
# Does ppc64le need its own?
 | 
					# Does ppc64le need its own?
 | 
				
			||||||
%ifarch ppc64 ppc64le
 | 
					%ifarch ppc64 ppc64le
 | 
				
			||||||
cp -a vpx_config.h %{buildroot}%{_includedir}/vpx/vpx_config-ppc64.h
 | 
					cp -a vpx_config.h %{buildroot}%{_includedir}/vpx/vpx_config-ppc64.h
 | 
				
			||||||
@ -199,7 +166,6 @@ cp -a vpx_config.h %{buildroot}%{_includedir}/vpx/vpx_config-%{_arch}.h
 | 
				
			|||||||
%endif
 | 
					%endif
 | 
				
			||||||
%endif
 | 
					%endif
 | 
				
			||||||
%endif
 | 
					%endif
 | 
				
			||||||
%endif
 | 
					 | 
				
			||||||
cp %{SOURCE1} %{buildroot}%{_includedir}/vpx/vpx_config.h
 | 
					cp %{SOURCE1} %{buildroot}%{_includedir}/vpx/vpx_config.h
 | 
				
			||||||
# for timestamp sync
 | 
					# for timestamp sync
 | 
				
			||||||
touch -r AUTHORS %{buildroot}%{_includedir}/vpx/vpx_config.h
 | 
					touch -r AUTHORS %{buildroot}%{_includedir}/vpx/vpx_config.h
 | 
				
			||||||
@ -235,6 +201,7 @@ rm -rf %{buildroot}%{_prefix}/src
 | 
				
			|||||||
%changelog
 | 
					%changelog
 | 
				
			||||||
* Wed Feb 15 2023 Pete Walter <pwalter@fedoraproject.org> - 1.13.0-2
 | 
					* Wed Feb 15 2023 Pete Walter <pwalter@fedoraproject.org> - 1.13.0-2
 | 
				
			||||||
- Fix whitespace in spec file
 | 
					- Fix whitespace in spec file
 | 
				
			||||||
 | 
					- Drop 32 bit arm support
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Wed Feb 15 2023 Tom Callaway <spot@fedoraproject.org> - 1.13.0-1
 | 
					* Wed Feb 15 2023 Tom Callaway <spot@fedoraproject.org> - 1.13.0-1
 | 
				
			||||||
- update to 1.13.0
 | 
					- update to 1.13.0
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user