busybox: fix build w/ glibc-2.32 by disabling NFS
This commit is contained in:
parent
7fd3de4b31
commit
9c1c11a065
3 changed files with 34 additions and 3 deletions
|
@ -654,7 +654,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y
|
||||||
CONFIG_FEATURE_MOUNT_VERBOSE=y
|
CONFIG_FEATURE_MOUNT_VERBOSE=y
|
||||||
CONFIG_FEATURE_MOUNT_HELPERS=y
|
CONFIG_FEATURE_MOUNT_HELPERS=y
|
||||||
CONFIG_FEATURE_MOUNT_LABEL=y
|
CONFIG_FEATURE_MOUNT_LABEL=y
|
||||||
CONFIG_FEATURE_MOUNT_NFS=y
|
CONFIG_FEATURE_MOUNT_NFS=n
|
||||||
CONFIG_FEATURE_MOUNT_CIFS=y
|
CONFIG_FEATURE_MOUNT_CIFS=y
|
||||||
CONFIG_FEATURE_MOUNT_FLAGS=y
|
CONFIG_FEATURE_MOUNT_FLAGS=y
|
||||||
CONFIG_FEATURE_MOUNT_FSTAB=y
|
CONFIG_FEATURE_MOUNT_FSTAB=y
|
||||||
|
|
32
srcpkgs/busybox/patches/missing-stime.patch
Normal file
32
srcpkgs/busybox/patches/missing-stime.patch
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
--- libbb/missing_syscalls.c 2019-06-10 12:50:53.000000000 +0200
|
||||||
|
+++ libbb/missing_syscalls.c 2021-01-29 20:48:33.413486161 +0100
|
||||||
|
@@ -7,14 +7,6 @@
|
||||||
|
|
||||||
|
#include "libbb.h"
|
||||||
|
|
||||||
|
-#if defined(ANDROID) || defined(__ANDROID__)
|
||||||
|
-/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
|
||||||
|
-# include <sys/syscall.h>
|
||||||
|
-pid_t getsid(pid_t pid)
|
||||||
|
-{
|
||||||
|
- return syscall(__NR_getsid, pid);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
int stime(const time_t *t)
|
||||||
|
{
|
||||||
|
struct timeval tv;
|
||||||
|
@@ -23,6 +15,14 @@
|
||||||
|
return settimeofday(&tv, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(ANDROID) || defined(__ANDROID__)
|
||||||
|
+/*# include <linux/timex.h> - for struct timex, but may collide with <time.h> */
|
||||||
|
+# include <sys/syscall.h>
|
||||||
|
+pid_t getsid(pid_t pid)
|
||||||
|
+{
|
||||||
|
+ return syscall(__NR_getsid, pid);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int sethostname(const char *name, size_t len)
|
||||||
|
{
|
||||||
|
return syscall(__NR_sethostname, name, len);
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'busybox'
|
# Template file for 'busybox'
|
||||||
pkgname=busybox
|
pkgname=busybox
|
||||||
version=1.31.1
|
version=1.31.1
|
||||||
revision=3
|
revision=4
|
||||||
hostmakedepends="perl"
|
hostmakedepends="perl"
|
||||||
checkdepends="zip"
|
checkdepends="zip"
|
||||||
short_desc="Swiss Army Knife of Embedded Linux"
|
short_desc="Swiss Army Knife of Embedded Linux"
|
||||||
|
@ -48,7 +48,6 @@ do_configure() {
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
*-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
|
*-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
|
||||||
-e /CONFIG_FEATURE_MOUNT_NFS/s/y/n/ \
|
|
||||||
${t}/.config;;
|
${t}/.config;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue