Skip to content

Commit 7ddfb8d

Browse files
committed
Synchronize musl with POSIX-Process internal libs
Signed-off-by: gaulthier gain <[email protected]>
1 parent 8aab6ba commit 7ddfb8d

4 files changed

+9
-1
lines changed

Makefile.uk.musl.conf

+2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ LIBMUSL_CONF_HDRS-y += $(LIBMUSL)/include/sys/resource.h
88
LIBMUSL_CONF_HDRS-y += $(LIBMUSL)/include/sys/sysinfo.h
99
LIBMUSL_CONF_HDRS-y += $(LIBMUSL)/include/unistd.h
1010

11+
ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
1112
LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/confstr.c
1213
LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/fpathconf.c
1314
LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/legacy.c
1415
LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/pathconf.c
1516
LIBMUSL_CONF_SRCS-y += $(LIBMUSL)/src/conf/sysconf.c
17+
endif
1618

1719
$(eval $(call _libmusl_import_lib,conf,$(LIBMUSL_CONF_HDRS-y),$(LIBMUSL_CONF_SRCS-y)))

Makefile.uk.musl.legacy

+2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/ftw.c
2828
#LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/futimes.c
2929
LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getdtablesize.c
3030
LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getloadavg.c
31+
ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
3132
LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getpagesize.c
33+
endif
3234
LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getpass.c
3335
LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/getusershell.c
3436
LIBMUSL_LEGACY_SRCS-y += $(LIBMUSL)/src/legacy/isastream.c

Makefile.uk.musl.misc

+2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setdomainname.c
7575
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/setrlimit.c
7676
#LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/syscall.c|misc
7777
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/syslog.c
78+
ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
7879
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/uname.c
80+
endif
7981
LIBMUSL_MISC_SRCS-y += $(LIBMUSL)/src/misc/wordexp.c
8082

8183
$(eval $(call _libmusl_import_lib,misc,$(LIBMUSL_MISC_HDRS-y),$(LIBMUSL_MISC_SRCS-y)))

Makefile.uk.musl.unistd

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getgroups.c
4646
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getlogin.c
4747
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getlogin_r.c
4848
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/getuid.c
49-
else
49+
endif
50+
51+
ifneq ($(CONFIG_LIBPOSIX_SYSINFO),y)
5052
LIBMUSL_UNISTD_SRCS-y += $(LIBMUSL)/src/unistd/gethostname.c
5153
endif
5254

0 commit comments

Comments
 (0)