diff mbox

batman-adv-devel: Exchange include order for uapi header files

Message ID 1467970715-18251-1-git-send-email-sven.eckelmann@open-mesh.com (mailing list archive)
State Accepted, archived
Commit 5306b0e735a04ba9b661381ca5fa2426ebe1cbc7
Headers

Commit Message

Sven Eckelmann July 8, 2016, 9:38 a.m. UTC 
  The build of netlink.c currently fails because the definition of
GENL_NAMESIZE and similar things are missing. This is is caused by an
incorrect order of backports and non-backports header files mixed up with
uapi and non-uapi header files. Parts of the header files would not get
included by include_next because it not anymore in the remaining search
paths.

Reported: Marek Lindner <marek.lindner@open-mesh.com>
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
---
Please check again - I might have forgotten something.
---
 batman-adv-devel/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Marek Lindner July 8, 2016, 9:50 a.m. UTC | #1 
On Friday, July 08, 2016 11:38:35 Sven Eckelmann wrote:
> The build of netlink.c currently fails because the definition of
> GENL_NAMESIZE and similar things are missing. This is is caused by an
> incorrect order of backports and non-backports header files mixed up with
> uapi and non-uapi header files. Parts of the header files would not get
> included by include_next because it not anymore in the remaining search
> paths.
> 
> Reported: Marek Lindner <marek.lindner@open-mesh.com>
> Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
> ---
> Please check again - I might have forgotten something.
> ---
>  batman-adv-devel/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied in revision 5306b0e.

Thanks,
Marek
diff mbox

Patch

diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile
index 60ac5fd..4fa20ab 100644
--- a/batman-adv-devel/Makefile
+++ b/batman-adv-devel/Makefile
@@ -64,10 +64,10 @@  PKG_EXTRA_CFLAGS:= \
 NOSTDINC_FLAGS = \
 	-I$(PKG_BUILD_DIR)/net/batman-adv \
 	-I$(PKG_BUILD_DIR)/include/ \
-	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
 	-I$(STAGING_DIR)/usr/include/mac80211-backport \
-	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
+	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
 	-I$(STAGING_DIR)/usr/include/mac80211 \
+	-I$(STAGING_DIR)/usr/include/mac80211/uapi \
 	-include backport/backport.h \
 	-include $(PKG_BUILD_DIR)/compat-hacks.h \
 	-DBATADV_SOURCE_VERSION=\\\"$(PKG_BATMAN_SHORTREV)\\\" \