aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2020-08-04 08:24:19 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2020-08-13 17:12:56 +0200
commit5c69ad0ecdc18cf51b312c7c82848f4438fe1c8d (patch)
treeaeb911b86b6dab262429a8a9fa76bcdf697b02a3 /libbb
parent9914d8b861a0edb42051bd68a37bceb0562daa70 (diff)
downloadbusybox-w32-5c69ad0ecdc18cf51b312c7c82848f4438fe1c8d.tar.gz
busybox-w32-5c69ad0ecdc18cf51b312c7c82848f4438fe1c8d.tar.bz2
busybox-w32-5c69ad0ecdc18cf51b312c7c82848f4438fe1c8d.zip
build system: drop PLATFORM_LINUX
PLATFORM_LINUX is a hidden configuration option which is disabled by default and enabled at over a hundred locations for features that are deemed to be Linux specific. The only effect of PLATFORM_LINUX is to control compilation of libbb/match_fstype.c. This file is only needed by mount and umount. Remove all references to PLATFORM_LINUX and compile match_fstype.c if mount or umount is enabled. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/Config.src2
-rw-r--r--libbb/Kbuild.src3
2 files changed, 2 insertions, 3 deletions
diff --git a/libbb/Config.src b/libbb/Config.src
index 312aa1831..f97de8ef7 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -334,7 +334,6 @@ config FEATURE_VERBOSE_CP_MESSAGE
334config FEATURE_USE_SENDFILE 334config FEATURE_USE_SENDFILE
335 bool "Use sendfile system call" 335 bool "Use sendfile system call"
336 default y 336 default y
337 select PLATFORM_LINUX
338 help 337 help
339 When enabled, busybox will use the kernel sendfile() function 338 When enabled, busybox will use the kernel sendfile() function
340 instead of read/write loops to copy data between file descriptors 339 instead of read/write loops to copy data between file descriptors
@@ -376,7 +375,6 @@ config FEATURE_SKIP_ROOTFS
376config MONOTONIC_SYSCALL 375config MONOTONIC_SYSCALL
377 bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" 376 bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
378 default y 377 default y
379 select PLATFORM_LINUX
380 help 378 help
381 Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring 379 Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
382 time intervals (time, ping, traceroute etc need this). 380 time intervals (time, ping, traceroute etc need this).
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 8c9ba8cca..676300801 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -112,7 +112,8 @@ lib-y += xgethostbyname.o
112lib-y += xreadlink.o 112lib-y += xreadlink.o
113lib-y += xrealloc_vector.o 113lib-y += xrealloc_vector.o
114 114
115lib-$(CONFIG_PLATFORM_LINUX) += match_fstype.o 115lib-$(CONFIG_MOUNT) += match_fstype.o
116lib-$(CONFIG_UMOUNT) += match_fstype.o
116 117
117lib-$(CONFIG_FEATURE_UTMP) += utmp.o 118lib-$(CONFIG_FEATURE_UTMP) += utmp.o
118 119