diff mbox

[v2,4/8] vlc: remove dependency on C library

Message ID 1453929930-18215-5-git-send-email-thomas.petazzoni@free-electrons.com
State Accepted
Commit 0fed01a500f5a3e5a4b2779021c16bd4c9d31369
Headers show

Commit Message

Thomas Petazzoni Jan. 27, 2016, 9:25 p.m. UTC 
vlc uses <spawn.h> which was not available in old uClibc
versions. However, since we are removing support for uClibc 0.9.33, we
can get rid of such dependency. In addition, <spawn.h> is provided by
musl, and therefore VLC can be enabled with this C library.

Consequently, this commit completely removes any C library dependency
for the vlc package. The only special case that needs to be handled is
the Blackfin external toolchain from Analog Devices, which still uses
an old uClibc version that doesn't provide <spawn.h>.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Romain Naour <romain.naour@gmail.com>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
---
 package/vlc/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Peter Korsgaard Feb. 1, 2016, 6:04 p.m. UTC | #1 
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > vlc uses <spawn.h> which was not available in old uClibc
 > versions. However, since we are removing support for uClibc 0.9.33, we
 > can get rid of such dependency. In addition, <spawn.h> is provided by
 > musl, and therefore VLC can be enabled with this C library.

 > Consequently, this commit completely removes any C library dependency
 > for the vlc package. The only special case that needs to be handled is
 > the Blackfin external toolchain from Analog Devices, which still uses
 > an old uClibc version that doesn't provide <spawn.h>.

vlc contains several references to fork(), so it should really just
depend on BR2_USE_MMU.

Committed with that fixed, thanks.
diff mbox

Patch

diff --git a/package/vlc/Config.in b/package/vlc/Config.in
index 03e85c3..cad21e2 100644
--- a/package/vlc/Config.in
+++ b/package/vlc/Config.in
@@ -5,12 +5,12 @@  endif
 
 config BR2_PACKAGE_VLC
 	bool "vlc"
-	depends on (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) # spawn.h
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
 	select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
 	select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV
 	select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3
@@ -32,7 +32,7 @@  config BR2_PACKAGE_VLC_OPENCV3_BACKEND
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
 
-comment "vlc needs a uclibc snapshot, uclibc-ng or (e)glibc toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
-	depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) \
-		|| !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
+comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
 		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7