From 826a2bc18bc0be0b08f2926c9fa1819fe909557c Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 4 Oct 2015 16:34:41 +0100 Subject: [PATCH] python-numpy: re-enable for uClibc In commit b0f025386f6861fdc21e38e3a33b65669276f2c2 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: Arnout Vandecappelle (Essensium/Mind) Cc: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/opencv3/Config.in | 1 - package/python-numpy/Config.in | 3 --- 2 files changed, 4 deletions(-) diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index 934d546e05..9492603b0d 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -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. diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 1f9938a329..f8170f8fd1 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -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. -- 2.30.2