Commit 826a2bc1 authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Thomas Petazzoni
Browse files

python-numpy: re-enable for uClibc 



In commit b0f02538 a patch was added
to make sure that python-numpy does work in uClibc. This patch was
needed for the x86 architecture, because uClibc in fact does support
fenv for x86. However, we don't turn on this support in our uClibc
config. Because the Config.in depends still allowed uClibc for x86,
this lead to a built failure, which lead to the fix in commit b0f02538.
But since this fix also fixes it for all other (supported)
architectures, we can just remove the !uClibc dependency completely.

This is also propagated to the reverse dependency in opencv3.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 9b19438c

package/opencv3/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON 
	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \

		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \

		|| BR2_sh || BR2_x86_64 # python-numpy

	depends on !BR2_TOOLCHAIN_USES_UCLIBC || BR2_i386 || BR2_x86_64 # python-numpy

	select BR2_PACKAGE_PYTHON_NUMPY

	help

	  Include opencv_python module into the OpenCV build.

package/python-numpy/Config.in

+0 −3
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ config BR2_PACKAGE_PYTHON_NUMPY 
	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \

		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \

		|| BR2_sh || BR2_x86_64

	# numpy needs fenv.h. Available for all architectures in

	# glibc, but only for x86 and x86-64 in uClibc.

	depends on !BR2_TOOLCHAIN_USES_UCLIBC || BR2_i386 || BR2_x86_64

	help

	  NumPy is the fundamental package for scientific computing

	  with Python.