libuwifi: fix dev installation

The ccan needs config.h file. This commit fixes the includes
and copies the config.h file to the correct position.

Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/libs/libuwifi/Makefile b/libs/libuwifi/Makefile
index c79f84dedee7ecc8581492aeb9f91adebba548a9..4cb43911048223fe85fb01d8f6c14c1bca026f27 100644 (file)
--- a/libs/libuwifi/Makefile
+++ b/libs/libuwifi/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libuwifi
 PKG_VERSION:=2019-05-27
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/br101/libuwifi.git
@@ -37,8 +37,12 @@ MAKE_FLAGS += DEBUG=0 LIBNL=tiny BUILD_RADIOTAP=0
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/uwifi
+
        $(CP) $(PKG_BUILD_DIR)/include/uwifi/*.h $(1)/usr/include/uwifi
+       $(CP) $(PKG_BUILD_DIR)/linux/*.h $(1)/usr/include/uwifi
+
        $(CP) $(PKG_BUILD_DIR)/ccan $(1)/usr/include/
+       $(CP) $(PKG_BUILD_DIR)/config.h $(1)/usr/include/ccan/
 
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/build/libuwifi.{a,so*} $(1)/usr/lib/

diff --git a/libs/libuwifi/patches/500-ccan-includes.patch b/libs/libuwifi/patches/500-ccan-includes.patch
new file mode 100644 (file)
index 0000000..7a1e6af
--- /dev/null
+++ b/libs/libuwifi/patches/500-ccan-includes.patch
@@ -0,0 +1,100 @@
+Index: libuwifi-2019-05-27/ccan/build_assert/_info
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/build_assert/_info
++++ libuwifi-2019-05-27/ccan/build_assert/_info
+@@ -1,4 +1,4 @@
+-#include "config.h"
++#include "../config.h"
+ #include <stdio.h>
+ #include <string.h>
+ 
+Index: libuwifi-2019-05-27/ccan/check_type/_info
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/check_type/_info
++++ libuwifi-2019-05-27/ccan/check_type/_info
+@@ -1,4 +1,4 @@
+-#include "config.h"
++#include "../config.h"
+ #include <stdio.h>
+ #include <string.h>
+ 
+Index: libuwifi-2019-05-27/ccan/check_type/check_type.h
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/check_type/check_type.h
++++ libuwifi-2019-05-27/ccan/check_type/check_type.h
+@@ -1,7 +1,7 @@
+ /* CC0 (Public domain) - see LICENSE file for details */
+ #ifndef CCAN_CHECK_TYPE_H
+ #define CCAN_CHECK_TYPE_H
+-#include "config.h"
++#include "../config.h"
+ 
+ /**
+  * check_type - issue a warning or build failure if type is not correct.
+Index: libuwifi-2019-05-27/ccan/container_of/_info
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/container_of/_info
++++ libuwifi-2019-05-27/ccan/container_of/_info
+@@ -1,4 +1,4 @@
+-#include "config.h"
++#include "../config.h"
+ #include <stdio.h>
+ #include <string.h>
+ 
+Index: libuwifi-2019-05-27/ccan/container_of/container_of.h
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/container_of/container_of.h
++++ libuwifi-2019-05-27/ccan/container_of/container_of.h
+@@ -3,7 +3,7 @@
+ #define CCAN_CONTAINER_OF_H
+ #include <stddef.h>
+ 
+-#include "config.h"
++#include "../config.h"
+ #include <ccan/check_type/check_type.h>
+ 
+ /**
+Index: libuwifi-2019-05-27/ccan/list/_info
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/list/_info
++++ libuwifi-2019-05-27/ccan/list/_info
+@@ -1,4 +1,4 @@
+-#include "config.h"
++#include "../config.h"
+ #include <stdio.h>
+ #include <string.h>
+ 
+Index: libuwifi-2019-05-27/ccan/str/_info
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/str/_info
++++ libuwifi-2019-05-27/ccan/str/_info
+@@ -1,4 +1,4 @@
+-#include "config.h"
++#include "../config.h"
+ #include <stdio.h>
+ #include <string.h>
+ 
+Index: libuwifi-2019-05-27/ccan/str/debug.c
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/str/debug.c
++++ libuwifi-2019-05-27/ccan/str/debug.c
+@@ -1,5 +1,5 @@
+ /* CC0 (Public domain) - see LICENSE file for details */
+-#include "config.h"
++#include "../config.h"
+ #include <ccan/str/str_debug.h>
+ #include <assert.h>
+ #include <ctype.h>
+Index: libuwifi-2019-05-27/ccan/str/str.h
+===================================================================
+--- libuwifi-2019-05-27.orig/ccan/str/str.h
++++ libuwifi-2019-05-27/ccan/str/str.h
+@@ -1,7 +1,7 @@
+ /* CC0 (Public domain) - see LICENSE file for details */
+ #ifndef CCAN_STR_H
+ #define CCAN_STR_H
+-#include "config.h"
++#include "../config.h"
+ #include <string.h>
+ #include <stdbool.h>
+ #include <limits.h>