Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libuwifi: fix dev installation

Browse source 
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>
This commit is contained in:
Nick Hainke 2019-09-04 17:41:27 +02:00
parent 36c8518e7d
commit ba5d69edcd
2 changed files with 105 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/libuwifi/Makefile
View file

@ -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/

100
libs/libuwifi/patches/500-ccan-includes.patch Normal file
View file

@ -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>