wiringpi: bump to version 2.44
- rebase 0001-Adjust-for-buildroot-build.patch - delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch (all changes are incorporated into wiringpi-2.44) Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Peter Seiderer
Thomas Petazzoni
parent
2a222446b4
commit
76d36355de
@ -1,4 +1,4 @@
|
||||
From 10d5bde8d628a93993dd7305dc9a406da69f65a9 Mon Sep 17 00:00:00 2001
|
||||
From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Wed, 2 Dec 2015 00:22:26 +0100
|
||||
Subject: [PATCH] Adjust for buildroot build.
|
||||
@ -19,7 +19,7 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
3 files changed, 18 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/devLib/Makefile b/devLib/Makefile
|
||||
index 1b1ebe0..84b4d2a 100644
|
||||
index cf665d6..3fb41e8 100644
|
||||
--- a/devLib/Makefile
|
||||
+++ b/devLib/Makefile
|
||||
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
|
||||
@ -54,7 +54,7 @@ index 1b1ebe0..84b4d2a 100644
|
||||
|
||||
.PHONY: install-static
|
||||
diff --git a/gpio/Makefile b/gpio/Makefile
|
||||
index 7dcd090..dc4be72 100644
|
||||
index f41a005..7095fa5 100644
|
||||
--- a/gpio/Makefile
|
||||
+++ b/gpio/Makefile
|
||||
@@ -32,11 +32,11 @@ endif
|
||||
@ -63,14 +63,14 @@ index 7dcd090..dc4be72 100644
|
||||
DEBUG = -O2
|
||||
-CC = gcc
|
||||
-INCLUDE = -I$(DESTDIR)$(PREFIX)/include
|
||||
-CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
|
||||
-CFLAGS = $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
|
||||
+CC ?= gcc
|
||||
+INCLUDE = -I../wiringPi -I../devLib
|
||||
+CFLAGS += $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
|
||||
+CFLAGS += $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
|
||||
|
||||
-LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib
|
||||
+LDFLAGS = -L../wiringPi -L../devLib
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread
|
||||
LIBS = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
|
||||
|
||||
# May not need to alter anything below this line
|
||||
@@ -52,9 +52,13 @@ version.h: ../VERSION
|
||||
@ -89,7 +89,7 @@ index 7dcd090..dc4be72 100644
|
||||
$Q echo [Compile] $<
|
||||
$Q $(CC) -c $(CFLAGS) $< -o $@
|
||||
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
|
||||
index acb6e58..8b84dc6 100644
|
||||
index e1868b9..68c950e 100644
|
||||
--- a/wiringPi/Makefile
|
||||
+++ b/wiringPi/Makefile
|
||||
@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
|
||||
@ -100,20 +100,20 @@ index acb6e58..8b84dc6 100644
|
||||
+CC ?= gcc
|
||||
INCLUDE = -I.
|
||||
DEFS = -D_GNU_SOURCE
|
||||
-CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
|
||||
+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
|
||||
-CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
|
||||
+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
|
||||
|
||||
LIBS =
|
||||
LIBS = -lm -lpthread -lrt -lcrypt
|
||||
|
||||
@@ -90,6 +90,7 @@ $(STATIC): $(OBJ)
|
||||
@@ -79,6 +79,7 @@ $(STATIC): $(OBJ)
|
||||
$(DYNAMIC): $(OBJ)
|
||||
$Q echo "[Link (Dynamic)]"
|
||||
$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) -lpthread $(OBJ)
|
||||
$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
|
||||
+ $Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so
|
||||
|
||||
.c.o:
|
||||
$Q echo [Compile] $<
|
||||
@@ -115,7 +116,7 @@ install: $(DYNAMIC)
|
||||
@@ -104,7 +105,7 @@ install: $(DYNAMIC)
|
||||
$Q echo "[Install Dynamic Lib]"
|
||||
$Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib
|
||||
$Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From 7f65eb37a82a6d9b095d9c8f262ad9dd205acd03 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 30 Jan 2016 16:57:38 -0800
|
||||
Subject: [PATCH] include <asm/ioctl.h> directly for _IOC_SIZEBITS
|
||||
|
||||
Fixes errors like
|
||||
| wiringPiSPI.c: In function 'wiringPiSPIDataRW':
|
||||
| wiringPiSPI.c:89:35: error: '_IOC_SIZEBITS' undeclared (first use in
|
||||
this function)
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
[Patch from https://raw.githubusercontent.com/agherzan/meta-raspberrypi/master/recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch]
|
||||
Signed-off-by: Peter Seiderere <ps.report@gmx.net>
|
||||
---
|
||||
Upstream-Status: Submitted
|
||||
|
||||
wiringPi/wiringPi.c | 1 +
|
||||
wiringPi/wiringPiI2C.c | 1 +
|
||||
wiringPi/wiringPiSPI.c | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
|
||||
index 32e5100..cb5db9d 100644
|
||||
--- a/wiringPi/wiringPi.c
|
||||
+++ b/wiringPi/wiringPi.c
|
||||
@@ -64,6 +64,7 @@
|
||||
#include <time.h>
|
||||
#include <fcntl.h>
|
||||
#include <pthread.h>
|
||||
+#include <asm/ioctl.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
diff --git a/wiringPi/wiringPiI2C.c b/wiringPi/wiringPiI2C.c
|
||||
index c787bce..efdf53c 100644
|
||||
--- a/wiringPi/wiringPiI2C.c
|
||||
+++ b/wiringPi/wiringPiI2C.c
|
||||
@@ -52,6 +52,7 @@
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <asm/ioctl.h>
|
||||
|
||||
#include "wiringPi.h"
|
||||
#include "wiringPiI2C.h"
|
||||
diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c
|
||||
index 453df31..ae3c7d9 100644
|
||||
--- a/wiringPi/wiringPiSPI.c
|
||||
+++ b/wiringPi/wiringPiSPI.c
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
+#include <asm/ioctl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/spi/spidev.h>
|
||||
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# locally computed
|
||||
sha256 0775e3bfa2df2131746c75d611ad354e5c884661be0d9de9fd786fc96f6ad918 wiringPi-2.32.tar.gz
|
||||
# Locally calculated
|
||||
sha256 464c98ed54f5c0ad6611e270be3491c4598a32b7e86b208255862a301c564955 wiringpi-2.44.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WIRINGPI_VERSION = 2.32
|
||||
WIRINGPI_VERSION = 2.44
|
||||
WIRINGPI_SITE = git://git.drogon.net/wiringPi
|
||||
|
||||
WIRINGPI_LICENSE = LGPLv3+
|
||||
|
||||
Loading…
Reference in New Issue
Block a user