Skip to content
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

Jump to bottom

REVERT native: remove non required NATIVEINCLUDES #8940

Merged
merged 3 commits into from
Apr 12, 2018
Merged

REVERT native: remove non required NATIVEINCLUDES #8940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40c28d7
Revert "native: remove non required NATIVEINCLUDES"
cladmi Apr 12, 2018
ea52528
Revert "posix/osx: fix missing AF_LINK on OSX native"
cladmi Apr 12, 2018
ed49323
Revert "posix/osx: fix type conflict on OSX native"
cladmi Apr 12, 2018
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
2 changes: 2 additions & 0 deletions boards/native/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ MODULE = board
DIRS = drivers

include $(RIOTBASE)/Makefile.base

INCLUDES = $(NATIVEINCLUDES)
12 changes: 8 additions & 4 deletions boards/native/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
export CPU = native
export NATIVEINCLUDES += -DNATIVE_INCLUDES
export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/

# Configuration for core/include/kernel_types.h
CFLAGS += -DNATIVE_INCLUDES
export CPU = native

USEMODULE += native-drivers

Expand Down Expand Up @@ -113,7 +115,7 @@ debug-valgrind-server: export VALGRIND_FLAGS ?= --vgdb=yes --vgdb-error=0 -v \
term-cachegrind: export CACHEGRIND_FLAGS += --tool=cachegrind
term-gprof: export TERMPROG = GMON_OUT_PREFIX=gmon.out $(ELFFILE)
all-valgrind: export CFLAGS += -DHAVE_VALGRIND_H -g
all-valgrind: export CFLAGS += $(shell pkg-config valgrind --cflags)
all-valgrind: export NATIVEINCLUDES += $(shell pkg-config valgrind --cflags)
all-debug: export CFLAGS += -g
all-cachegrind: export CFLAGS += -g
all-gprof: export CFLAGS += -pg
Expand All @@ -122,6 +124,8 @@ all-asan: export CFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
all-asan: export CFLAGS += -DNATIVE_IN_CALLOC
all-asan: export LINKFLAGS += -fsanitize=address -fno-omit-frame-pointer -g

export INCLUDES += $(NATIVEINCLUDES)

export CFLAGS += -DDEBUG_ASSERT_VERBOSE

# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
Expand Down
2 changes: 2 additions & 0 deletions boards/native/drivers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
MODULE = native-drivers

include $(RIOTBASE)/Makefile.base

INCLUDES = $(NATIVEINCLUDES)
2 changes: 2 additions & 0 deletions cpu/native/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ ifneq (,$(filter trace,$(USEMODULE)))
endif

include $(RIOTBASE)/Makefile.base

INCLUDES = $(NATIVEINCLUDES)
4 changes: 3 additions & 1 deletion cpu/native/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include

# Local include for OSX
ifeq ($(BUILDOSXNATIVE),1)
INCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
export NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
endif

USEMODULE += periph
Expand Down
2 changes: 2 additions & 0 deletions cpu/native/mtd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
MODULE := mtd_native

include $(RIOTBASE)/Makefile.base

INCLUDES = $(NATIVEINCLUDES)
2 changes: 2 additions & 0 deletions cpu/native/netdev_tap/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBASE)/Makefile.base

INCLUDES = $(NATIVEINCLUDES)
2 changes: 2 additions & 0 deletions cpu/native/socket_zep/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
include $(RIOTBASE)/Makefile.base

INCLUDES = $(NATIVEINCLUDES)
5 changes: 0 additions & 5 deletions sys/posix/include/sys/bytes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@
extern "C" {
#endif

#ifndef __MACH__
typedef size_t socklen_t; /**< socket address length */
#else
/* Defined for OSX with a different type */
typedef __darwin_socklen_t socklen_t; /**< socket address length */
#endif

#ifdef __cplusplus
}
Expand Down
3 changes: 0 additions & 3 deletions sys/posix/include/sys/socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@
sa_family_t sa_prefix##family

#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
#ifdef __MACH__
#define AF_LINK (18) /* Link layer interface */
#endif
#endif

#include <stdlib.h>
Expand Down