Browse Source

package: remove references to uClibc 0.9.32

This commit removes all remaining references to uClibc 0.9.32.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni 11 năm trước cách đây
mục cha
commit
1eda5f06f1

+ 1 - 2
package/aiccu/Config.in

@@ -5,8 +5,7 @@ config BR2_PACKAGE_AICCU
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
 	# Uses dn_skipname(), only available since 0.9.33
 	# Uses dn_skipname(), only available since 0.9.33
-	depends on !BR2_UCLIBC_VERSION_0_9_31 && \
-		!BR2_UCLIBC_VERSION_0_9_32
+	depends on !BR2_UCLIBC_VERSION_0_9_31
 	# AVR32 only has uClibc 0.9.31, so there's no way it can build
 	# AVR32 only has uClibc 0.9.31, so there's no way it can build
 	# due to the lack of dn_skipname(), even with external
 	# due to the lack of dn_skipname(), even with external
 	# toolchains.
 	# toolchains.

+ 1 - 3
package/connman/Config.in

@@ -4,7 +4,6 @@ config BR2_PACKAGE_CONNMAN
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_IPTABLES
 	depends on !BR2_avr32 # no inotify_init1
 	depends on !BR2_avr32 # no inotify_init1
-	depends on !BR2_UCLIBC_VERSION_0_9_32
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_INET_IPV6
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
@@ -67,5 +66,4 @@ endif # BR2_PACKAGE_CONNMAN
 
 
 comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver"
 comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver"
 	depends on BR2_USE_MMU && !BR2_avr32
 	depends on BR2_USE_MMU && !BR2_avr32
-	depends on BR2_UCLIBC_VERSION_0_9_32 || \
-		!BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS

+ 3 - 4
package/fio/Config.in

@@ -7,11 +7,10 @@ config BR2_PACKAGE_FIO
 	# release of uClibc, but is part of uClibc Git, and backported
 	# release of uClibc, but is part of uClibc Git, and backported
 	# in Buildroot patch set of uClibc 0.9.33. Therefore, we
 	# in Buildroot patch set of uClibc 0.9.33. Therefore, we
 	# disable the build of fio for external uClibc toolchains
 	# disable the build of fio for external uClibc toolchains
-	# (which use an unknown uClibc version) and for 0.9.31 and
-	# 0.9.32 which don't have posix_madvise().
+	# (which use an unknown uClibc version) and for 0.9.31 which
+	# don't have posix_madvise().
 	depends on !BR2_TOOLCHAIN_EXTERNAL_UCLIBC && \
 	depends on !BR2_TOOLCHAIN_EXTERNAL_UCLIBC && \
-		!BR2_UCLIBC_VERSION_0_9_31 && \
-		!BR2_UCLIBC_VERSION_0_9_32
+		!BR2_UCLIBC_VERSION_0_9_31
 	# fio uses fallocate() which becomes fallocate64() while compiling
 	# fio uses fallocate() which becomes fallocate64() while compiling
 	# with BR2_LARGEFILE but fallocate64() is not available on nios2
 	# with BR2_LARGEFILE but fallocate64() is not available on nios2
 	depends on !BR2_nios2
 	depends on !BR2_nios2

+ 1 - 2
package/iputils/Config.in

@@ -4,8 +4,7 @@ config BR2_PACKAGE_IPUTILS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
 	# requires dn_comp (only available in since uclibc 0.9.33)
 	# requires dn_comp (only available in since uclibc 0.9.33)
 	depends on !BR2_avr32
 	depends on !BR2_avr32
-	depends on !BR2_UCLIBC_VERSION_0_9_31 && \
-		!BR2_UCLIBC_VERSION_0_9_32
+	depends on !BR2_UCLIBC_VERSION_0_9_31
 	help
 	help
 	  This package is set of small useful utilities for Linux networking.
 	  This package is set of small useful utilities for Linux networking.
 	  It includes complete versions of ping, traceroute, etc.
 	  It includes complete versions of ping, traceroute, etc.

+ 1 - 1
package/libglib2/libglib2.mk

@@ -50,7 +50,7 @@ LIBGLIB2_CONF_ENV = \
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
 
 
 # old uClibc versions don't provide qsort_r
 # old uClibc versions don't provide qsort_r
-ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
+ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y)
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no
 else
 else
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes
 LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes

+ 0 - 1
package/mpd/Config.in

@@ -7,7 +7,6 @@ menuconfig BR2_PACKAGE_MPD
 	# avr32, sparc & CS powerpc gcc are too old
 	# avr32, sparc & CS powerpc gcc are too old
 	depends on !(BR2_avr32 || BR2_sparc)
 	depends on !(BR2_avr32 || BR2_sparc)
 	depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
 	depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
-	depends on !BR2_UCLIBC_VERSION_0_9_32 # lacks signalfd
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
 	select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)

+ 1 - 1
package/mtr/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MTR
 config BR2_PACKAGE_MTR
 	bool "mtr"
 	bool "mtr"
 	# res_mkquery() only available in 0.9.33+
 	# res_mkquery() only available in 0.9.33+
-	depends on !BR2_UCLIBC_VERSION_0_9_31 && !BR2_UCLIBC_VERSION_0_9_32
+	depends on !BR2_UCLIBC_VERSION_0_9_31
 	depends on !BR2_avr32
 	depends on !BR2_avr32
 	help
 	help
 	  mtr combines the functionality of the 'traceroute' and 'ping'
 	  mtr combines the functionality of the 'traceroute' and 'ping'