diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-10 14:43:22 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-18 19:20:58 +0200 |
commit | f807b8e96e308eeb32d466733060bcfb623b57f1 (patch) | |
tree | 4e376227254c74c1032bdb42ba25c4665917fb6b | |
parent | 2f6dc07d8fe5cc3349b28ea3351baf050af750d5 (diff) | |
download | busybox-w32-f807b8e96e308eeb32d466733060bcfb623b57f1.tar.gz busybox-w32-f807b8e96e308eeb32d466733060bcfb623b57f1.tar.bz2 busybox-w32-f807b8e96e308eeb32d466733060bcfb623b57f1.zip |
inetd,mount: do not die if uclibc without RPC is detected
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/inetd.c | 3 | ||||
-rw-r--r-- | util-linux/mount.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/networking/inetd.c b/networking/inetd.c index 39169a935..3bf157b70 100644 --- a/networking/inetd.c +++ b/networking/inetd.c | |||
@@ -227,7 +227,8 @@ | |||
227 | 227 | ||
228 | #if ENABLE_FEATURE_INETD_RPC | 228 | #if ENABLE_FEATURE_INETD_RPC |
229 | # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) | 229 | # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) |
230 | # error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support" | 230 | # warning "You probably need to build uClibc with UCLIBC_HAS_RPC for NFS support" |
231 | /* not #error, since user may be using e.g. libtirpc instead */ | ||
231 | # endif | 232 | # endif |
232 | # include <rpc/rpc.h> | 233 | # include <rpc/rpc.h> |
233 | # include <rpc/pmap_clnt.h> | 234 | # include <rpc/pmap_clnt.h> |
diff --git a/util-linux/mount.c b/util-linux/mount.c index 6bb18524d..5fcc7958c 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -246,7 +246,8 @@ | |||
246 | /* This is just a warning of a common mistake. Possibly this should be a | 246 | /* This is just a warning of a common mistake. Possibly this should be a |
247 | * uclibc faq entry rather than in busybox... */ | 247 | * uclibc faq entry rather than in busybox... */ |
248 | # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) | 248 | # if defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) |
249 | # error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support" | 249 | # warning "You probably need to build uClibc with UCLIBC_HAS_RPC for NFS support" |
250 | /* not #error, since user may be using e.g. libtirpc instead */ | ||
250 | # endif | 251 | # endif |
251 | # include <rpc/rpc.h> | 252 | # include <rpc/rpc.h> |
252 | # include <rpc/pmap_prot.h> | 253 | # include <rpc/pmap_prot.h> |