From 984bddcedd703aef425210fb883077b2d68b0471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Mon, 17 Jun 2019 08:58:43 +0200 Subject: [PATCH] libc: cleanup port preparation - make port able to be prepared repeatedly Rpcgen refuses to overwrite an already existing header, so try to always remove it beforehand - get rid of 'cp' warning 'cp: warning: source file 'src/lib/libc/sys/sys/time.h' specified more than once' - silence patch message 'patch unexpectedly ends in middle of line' Fixes #3420. --- repos/libports/ports/libc.hash | 2 +- repos/libports/ports/libc.port | 3 ++- repos/libports/src/lib/libc/patches/MB_CUR_MAX.patch | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/repos/libports/ports/libc.hash b/repos/libports/ports/libc.hash index f6b196cf19..b88957fae7 100644 --- a/repos/libports/ports/libc.hash +++ b/repos/libports/ports/libc.hash @@ -1 +1 @@ -12ac556f17580c447e7502e0485a662610f59c06 +60a83fda51da9b110e8b857e557f737a8310d00c diff --git a/repos/libports/ports/libc.port b/repos/libports/ports/libc.port index d144f42235..7314442685 100644 --- a/repos/libports/ports/libc.port +++ b/repos/libports/ports/libc.port @@ -141,7 +141,7 @@ DIR_CONTENT(include/libc/sys) := \ utsname.h elf.h mtio.h _stdint.h atomic_common.h _ucontext.h \ _cpuset.h _bitset.h bitset.h _stdarg.h _uio.h auxv.h random.h \ _sockaddr_storage.h termios.h _termios.h _umtx.h kerneldump.h \ - conf.h disk_zone.h counter.h time.h) + conf.h disk_zone.h counter.h) DIRS += include/libc/sys/disk DIR_CONTENT(include/libc/sys/disk) := $(D)/sys/sys/disk/*h @@ -241,6 +241,7 @@ $(D)/include/rpcsvc/nis_object.x : $(DOWNLOADS) %.h: %.x @$(MSG_GENERATE)$(notdir $@) + $(VERBOSE)rm -f $@ $(VERBOSE)rpcgen -C -h -DWANT_NFS3 $< -o $@ generated_rpcsvc_files := \ diff --git a/repos/libports/src/lib/libc/patches/MB_CUR_MAX.patch b/repos/libports/src/lib/libc/patches/MB_CUR_MAX.patch index c51d6e52dd..7419fcc85a 100644 --- a/repos/libports/src/lib/libc/patches/MB_CUR_MAX.patch +++ b/repos/libports/src/lib/libc/patches/MB_CUR_MAX.patch @@ -20,4 +20,5 @@ -#define MB_CUR_MAX_L(x) ((size_t)___mb_cur_max_l(x)) +/* ASCII only */ +#define MB_CUR_MAX_L(x) 1 - \ No newline at end of file + +