From 15e9812ffbba2f0bb6487ccc54f8882e5c5f80b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Tue, 27 Aug 2019 16:06:41 +0200 Subject: [PATCH] pkg/oonf_api: remove exporting CFLAGS and INCLUDES CFLAGS and INCLUDES are already exported by `makefiles/vars.inc.mk`. It is a prerequisite to allow handling compilation without global exports. --- pkg/oonf_api/patches/0002-port-tests-to-riot.patch | 8 ++++---- pkg/oonf_api/patches/0003-port-example-to-riot.patch | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/oonf_api/patches/0002-port-tests-to-riot.patch b/pkg/oonf_api/patches/0002-port-tests-to-riot.patch index 1326d2c1f9..32f9a74b26 100644 --- a/pkg/oonf_api/patches/0002-port-tests-to-riot.patch +++ b/pkg/oonf_api/patches/0002-port-tests-to-riot.patch @@ -45,7 +45,7 @@ index 0000000..afbaf0f +# this has to be the absolute path of the RIOT-base dir +export RIOTBASE =$(CURDIR)/../../../../../.. + -+export CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO ++CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO + +## Modules to include. + @@ -59,7 +59,7 @@ index 0000000..afbaf0f + error daemonize is not supported on RIOT +endif + -+export INCLUDES += -I$(CURDIR)/../.. ++INCLUDES += -I$(CURDIR)/../.. + +QUIET ?= 1 + @@ -141,14 +141,14 @@ index 0000000..e472545 +# this has to be the absolute path of the RIOT-base dir +export RIOTBASE =$(CURDIR)/../../../../../.. + -+export CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO ++CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO + +## Modules to include. +USEMODULE += oonf_cunit +USEMODULE += oonf_common +USEMODULE += oonf_rfc5444 + -+export INCLUDES += -I$(CURDIR)/../.. ++INCLUDES += -I$(CURDIR)/../.. + +QUIET ?= 1 + diff --git a/pkg/oonf_api/patches/0003-port-example-to-riot.patch b/pkg/oonf_api/patches/0003-port-example-to-riot.patch index bbf7ac3ca3..ce0b997cc4 100644 --- a/pkg/oonf_api/patches/0003-port-example-to-riot.patch +++ b/pkg/oonf_api/patches/0003-port-example-to-riot.patch @@ -31,7 +31,7 @@ index 0000000..9d5653d +# this has to be the absolute path of the RIOT-base dir +export RIOTBASE =$(CURDIR)/../../../../.. + -+export CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO ++CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO + +## Modules to include. +