RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

sys/net/sock: Set SOCK_HAS_IPV6 in one place

Browse Source 
Based on ipv6 pseudomodule
This commit is contained in:
Erik Ekman 2021-10-08 01:26:19 +02:00
parent 3df56d576f
commit ff7bf09313
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/lwip/Makefile.include
View File

@ -33,9 +33,6 @@ ifneq (,$(filter lwip_netif_init_devs,$(USEMODULE)))
DIRS += $(RIOTBASE)/pkg/lwip/init_devs
endif
ifneq (,$(filter lwip_sock,$(USEMODULE)))
ifneq (,$(filter lwip_ipv6,$(USEMODULE)))
CFLAGS += -DSOCK_HAS_IPV6
endif
DIRS += $(RIOTBASE)/pkg/lwip/contrib/sock
endif
ifneq (,$(filter lwip_sock_async,$(USEMODULE)))

1
pkg/openwsn/Makefile.include
View File

@ -50,7 +50,6 @@ ifneq (,$(filter openwsn_cjoin,$(USEMODULE)))
endif
ifneq (,$(filter openwsn_sock%,$(USEMODULE)))
CFLAGS += -DSOCK_HAS_IPV6
ifneq (,$(filter openwsn_sock_async,$(USEMODULE)))
CFLAGS += -DSOCK_HAS_ASYNC
endif

9
sys/Makefile.include
View File

@ -8,9 +8,6 @@ endif
ifneq (,$(filter gnrc_sock,$(USEMODULE)))
USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/gnrc/sock/include
ifneq (,$(filter gnrc_ipv6,$(USEMODULE)))
CFLAGS += -DSOCK_HAS_IPV6
endif
endif
ifneq (,$(filter gnrc_sock_async,$(USEMODULE)))
@ -109,6 +106,12 @@ ifneq (,$(filter skald, $(USEMODULE)))
include $(RIOTBASE)/sys/net/ble/skald/Makefile.include
endif
ifneq (,$(filter sock sock_%,$(USEMODULE)))
ifneq (,$(filter ipv6,$(USEMODULE)))
CFLAGS += -DSOCK_HAS_IPV6
endif
endif
ifneq (,$(filter sock_async_event,$(USEMODULE)))
include $(RIOTBASE)/sys/net/sock/async/event/Makefile.include
endif

2
tests/gnrc_sock_async_event/Makefile
View File

@ -9,8 +9,6 @@ USEMODULE += sock_udp
USEMODULE += od
USEMODULE += xtimer
CFLAGS += -DSOCK_HAS_IPV6
# mock IPv6 gnrc_nettype
CFLAGS += -DTEST_SUITES -DGNRC_NETTYPE_IPV6=GNRC_NETTYPE_TEST