Skip to content

sys/posix: make posix module provide only headers. #10357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miri64 merged 1 commit into from
Mar 20, 2019
Merged

sys/posix: make posix module provide only headers. #10357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ifneq (,$(filter gnrc_uhcpc,$(USEMODULE)))
endif

ifneq (,$(filter uhcpc,$(USEMODULE)))
USEMODULE += posix
USEMODULE += posix_inet
endif

ifneq (,$(filter nordic_softdevice_ble,$(USEPKG)))
Expand Down Expand Up @@ -388,7 +388,7 @@ ifneq (,$(filter posix_sockets,$(USEMODULE)))
USEMODULE += bitfield
USEMODULE += random
USEMODULE += vfs
USEMODULE += posix
USEMODULE += posix_headers
USEMODULE += xtimer
endif

Expand All @@ -407,17 +407,23 @@ endif

ifneq (,$(filter shell_commands,$(USEMODULE)))
ifneq (,$(filter fib,$(USEMODULE)))
USEMODULE += posix
USEMODULE += posix_inet
endif
endif

ifneq (,$(filter posix_semaphore,$(USEMODULE)))
USEMODULE += sema
USEMODULE += xtimer
USEMODULE += posix_headers
endif

ifneq (,$(filter posix_time,$(USEMODULE)))
USEMODULE += xtimer
USEMODULE += posix_headers
endif

ifneq (,$(filter posix_inet,$(USEMODULE)))
USEMODULE += posix_headers
endif

ifneq (,$(filter lwip_sixlowpan,$(USEMODULE)))
Expand Down Expand Up @@ -499,6 +505,7 @@ endif
ifneq (,$(filter fib,$(USEMODULE)))
USEMODULE += universal_address
USEMODULE += xtimer
USEMODULE += posix_headers
endif

ifneq (,$(filter oonf_rfc5444,$(USEMODULE)))
Expand Down Expand Up @@ -695,18 +702,19 @@ ifneq (,$(filter devfs,$(USEMODULE)))
endif

ifneq (,$(filter vfs,$(USEMODULE)))
USEMODULE += posix_headers
ifeq (native, $(BOARD))
USEMODULE += native_vfs
endif
endif

ifneq (,$(filter sock_dns,$(USEMODULE)))
USEMODULE += sock_util
USEMODULE += posix
USEMODULE += posix_headers
endif

ifneq (,$(filter sock_util,$(USEMODULE)))
USEMODULE += posix
USEMODULE += posix_inet
USEMODULE += fmt
USEMODULE += sock_udp
endif
Expand Down
2 changes: 1 addition & 1 deletion cpu/esp32/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ ifneq (,$(filter ndn-riot,$(USEPKG)))
USEMODULE += cipher_modes
endif

ifneq (,$(findstring posix,$(USEMODULE)))
ifneq (,$(findstring posix_headers,$(USEMODULE)))
USEMODULE += newlib_syscalls_default
endif

Expand Down
2 changes: 1 addition & 1 deletion dist/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ QUIET ?= 1
# Modules to include:

#USEMODULE += shell
#USEMODULE += posix
#USEMODULE += posix_headers
#USEMODULE += xtimer

# If your application is very simple and doesn't use modules that use
Expand Down
1 change: 1 addition & 0 deletions examples/posix_sockets/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ USEMODULE += gnrc_udp
USEMODULE += gnrc_sock_udp
USEMODULE += posix_sockets
USEMODULE += posix_time
USEMODULE += posix_inet
# Add also the shell, some shell commands
USEMODULE += shell
USEMODULE += shell_commands
Expand Down
1 change: 1 addition & 0 deletions makefiles/pseudomodules.inc.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ PSEUDOMODULES += newlib_gnu_source
PSEUDOMODULES += newlib_nano
PSEUDOMODULES += openthread
PSEUDOMODULES += pktqueue
PSEUDOMODULES += posix_headers
PSEUDOMODULES += printf_float
PSEUDOMODULES += prng
PSEUDOMODULES += prng_%
Expand Down
1 change: 1 addition & 0 deletions pkg/ccn-lite/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ ifneq (,$(filter ccn-lite,$(USEPKG)))
USEMODULE += random
USEMODULE += timex
USEMODULE += tlsf-malloc
USEMODULE += posix_headers
endif
1 change: 0 additions & 1 deletion pkg/ccn-lite/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-riot/include
INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-core/include
INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-pkt/include
INCLUDES += -I$(PKGDIRBASE)/ccn-lite/src/ccnl-fwd/include
INCLUDES += -I$(RIOTBASE)/sys/posix/include

CFLAGS += -DCCNL_RIOT
2 changes: 1 addition & 1 deletion pkg/cn-cbor/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
USEMODULE += posix
USEMODULE += posix_headers
1 change: 1 addition & 0 deletions pkg/libcoap/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ifneq (,$(filter libcoap,$(USEPKG)))
USEMODULE += posix_sockets
USEMODULE += posix_headers
USEMODULE += gnrc_sock_udp
endif
3 changes: 1 addition & 2 deletions pkg/libcoap/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
INCLUDES += -I$(PKGDIRBASE)/libcoap \
-I$(RIOTBASE)/sys/posix/include
INCLUDES += -I$(PKGDIRBASE)/libcoap
3 changes: 3 additions & 0 deletions sys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ endif
ifneq (,$(filter eepreg,$(USEMODULE)))
DIRS += eepreg
endif
ifneq (,$(filter posix_inet,$(USEMODULE)))
DIRS += posix/inet
endif
ifneq (,$(filter posix_semaphore,$(USEMODULE)))
DIRS += posix/semaphore
endif
Expand Down
17 changes: 3 additions & 14 deletions sys/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ ifneq (,$(filter nhdp,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/routing/nhdp
endif

ifneq (,$(filter fib,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
endif
ifneq (,$(filter gnrc_netif,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/gnrc/netif/include
endif
Expand All @@ -14,15 +11,11 @@ ifneq (,$(filter gnrc_sock,$(USEMODULE)))
CFLAGS += -DSOCK_HAS_IPV6
endif
endif
ifneq (,$(filter posix,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
endif
ifneq (,$(filter posix_semaphore,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
endif
ifneq (,$(filter posix_sockets,$(USEMODULE)))

ifneq (,$(filter posix_headers,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
endif

ifneq (,$(filter pthread,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/pthread/include
endif
Expand All @@ -41,10 +34,6 @@ ifneq (,$(filter app_metadata,$(USEMODULE)))
endif
endif

ifneq (,$(filter vfs,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/posix/include
endif

ifneq (,$(filter cpp11-compat,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/cpp11-compat/include
# make sure cppsupport.o is linked explicitly because __dso_handle is not
Expand Down
2 changes: 2 additions & 0 deletions sys/posix/Makefile → sys/posix/inet/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
MODULE=posix_inet

include $(RIOTBASE)/Makefile.base
0 sys/posix/inet.c → sys/posix/inet/inet.c
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/gnrc_sock_dns/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ USEMODULE += auto_init_gnrc_netif

USEMODULE += shell_commands

USEMODULE += posix
USEMODULE += posix_inet

LOW_MEMORY_BOARDS := nucleo-f334r8 msb-430 msb-430h

Expand Down
2 changes: 1 addition & 1 deletion tests/pthread/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove
# jiminy-mega256rfr2: unknown type name: clockid_t
# mega-xplained: unknown type name: clockid_t

USEMODULE += posix
USEMODULE += posix_headers
USEMODULE += pthread

TEST_ON_CI_WHITELIST += all
Expand Down
2 changes: 1 addition & 1 deletion tests/pthread_condition_variable/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove

BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6

USEMODULE += posix
USEMODULE += posix_headers
USEMODULE += pthread
USEMODULE += xtimer

Expand Down
2 changes: 1 addition & 1 deletion tests/pthread_cooperation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove

BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6

USEMODULE += posix
USEMODULE += posix_headers
USEMODULE += pthread

TEST_ON_CI_WHITELIST += all
Expand Down
2 changes: 1 addition & 1 deletion tests/pthread_tls/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BOARD_BLACKLIST := arduino-mega2560 waspmote-pro arduino-uno arduino-duemilanove
# jiminy-mega256rfr2: unknown type name: clockid_t
# mega-xplained: unknown type name: clockid_t

USEMODULE += posix
USEMODULE += posix_headers
USEMODULE += pthread

TEST_ON_CI_WHITELIST += all
Expand Down
2 changes: 1 addition & 1 deletion tests/unittests/tests-sock_util/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ USEMODULE += gnrc_sock
USEMODULE += gnrc_ipv6
USEMODULE += ipv4_addr
USEMODULE += ipv6_addr
USEMODULE += posix
USEMODULE += posix_headers