+++ /dev/null
-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.
-
- - enable CC override
- - fix devLib/gpio include path for local build (without installing first)
- - change CFLAGS from '=' to '+=' to honour buildroot given flags
- - add linker name link for libwiringPiDev and libwiringPi for local linking
- (without installing first)
- - fix install linker name link (do not link with absolute path)
- - add gpio-static linking target
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-
- - Rebased for wiringpi-8d188fa0e00bb8c6ff6eddd07bf92857e9bd533a
-
-Signed-off-by: Atanas Palavrov <palavrov@gmail.com>
----
- devLib/Makefile | 9 +++++----
- gpio/Makefile | 14 +++++++++-----
- wiringPi/Makefile | 7 ++++---
- 3 files changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/devLib/Makefile b/devLib/Makefile
-index cf665d6..3fb41e8 100644
---- a/devLib/Makefile
-+++ b/devLib/Makefile
-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
-
- #DEBUG = -g -O0
- DEBUG = -O2
--CC = gcc
--INCLUDE = -I.
-+CC ?= gcc
-+INCLUDE = -I../wiringPi
- DEFS = -D_GNU_SOURCE
--CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
-+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
-
- LIBS =
-
-@@ -69,6 +69,7 @@ $(STATIC): $(OBJ)
- $(DYNAMIC): $(OBJ)
- $Q echo "[Link (Dynamic)]"
- $Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ)
-+ $Q ln -sf libwiringPiDev.so.$(VERSION) libwiringPiDev.so
-
- .c.o:
- $Q echo [Compile] $<
-@@ -93,7 +94,7 @@ install: $(DYNAMIC)
- $Q echo "[Install Dynamic Lib]"
- $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib
- $Q install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION)
-- $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so
-+ $Q ln -sf libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so
- $Q $(LDCONFIG)
-
- .PHONY: install-static
-diff --git a/gpio/Makefile b/gpio/Makefile
-index 9ec160d..360d64c 100644
---- a/gpio/Makefile
-+++ b/gpio/Makefile
-@@ -32,11 +32,11 @@ endif
-
- #DEBUG = -g -O0
- DEBUG = -O2
--CC = gcc
--INCLUDE = -I$(DESTDIR)$(PREFIX)/include
--CFLAGS = $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
-+CC ?= gcc
-+INCLUDE = -I../wiringPi -I../devLib
-+CFLAGS += $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
-
--LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib
-+LDFLAGS = -L../wiringPi -L../devLib
- LIBS = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
-
- # May not need to alter anything below this line
-@@ -52,9 +52,13 @@ version.h: ../VERSION
- $Q echo Need to run newVersion above.
-
- gpio: $(OBJ)
-- $Q echo [Link]
-+ $Q echo "[Link (Dynamic)]"
- $Q $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS)
-
-+gpio-static: $(OBJ)
-+ $Q echo "[Link (Static)]"
-+ $Q $(CC) -static -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread
-+
- .c.o:
- $Q echo [Compile] $<
- $Q $(CC) -c $(CFLAGS) $< -o $@
-diff --git a/wiringPi/Makefile b/wiringPi/Makefile
-index 287fa58..81595d3 100644
---- a/wiringPi/Makefile
-+++ b/wiringPi/Makefile
-@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
-
- #DEBUG = -g -O0
- DEBUG = -O2
--CC = gcc
-+CC ?= gcc
- INCLUDE = -I.
- DEFS = -D_GNU_SOURCE
--CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
-+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
- #CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Wconversion -Winline $(INCLUDE) -pipe -fPIC
-
- LIBS = -lm -lpthread -lrt -lcrypt
-@@ -76,6 +76,7 @@ static:
- $(DYNAMIC): $(OBJ)
- $Q echo "[Link (Dynamic)]"
- $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] $<
-@@ -101,7 +102,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)
-- $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so
-+ $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so
- $Q $(LDCONFIG)
-
- .PHONY: install-deb
---
-2.11.0
-
+++ /dev/null
-From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Mon, 20 Mar 2017 20:51:20 +0100
-Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
-
-For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h
-containing:
-
- /* These have totally bogus values and nobody uses them
- so far. Later on we'd have to use say 0x10000x and
- adjust CBAUD constant and drivers accordingly.
- #define B2500000 0x00001010
- #define B3000000 0x00001011
- #define B3500000 0x00001012
- #define B4000000 0x00001013 */
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- wiringPi/wiringSerial.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/wiringPi/wiringSerial.c b/wiringPi/wiringSerial.c
-index e1587ad..4ac8d1e 100644
---- a/wiringPi/wiringSerial.c
-+++ b/wiringPi/wiringSerial.c
-@@ -75,10 +75,18 @@ int serialOpen (const char *device, const int baud)
- case 1152000: myBaud = B1152000 ; break ;
- case 1500000: myBaud = B1500000 ; break ;
- case 2000000: myBaud = B2000000 ; break ;
-+#if defined(B2500000)
- case 2500000: myBaud = B2500000 ; break ;
-+#endif
-+#if defined(B3000000)
- case 3000000: myBaud = B3000000 ; break ;
-+#endif
-+#if defined(B3500000)
- case 3500000: myBaud = B3500000 ; break ;
-+#endif
-+#if defined(B4000000)
- case 4000000: myBaud = B4000000 ; break ;
-+#endif
-
- default:
- return -2 ;
---
-2.11.0
-
+++ /dev/null
-################################################################################
-#
-# wiringpi
-#
-################################################################################
-
-WIRINGPI_VERSION = 2.46
-WIRINGPI_SITE = git://git.drogon.net/wiringPi
-
-WIRINGPI_LICENSE = LGPL-3.0+
-WIRINGPI_LICENSE_FILES = COPYING.LESSER
-WIRINGPI_INSTALL_STAGING = YES
-
-define WIRINGPI_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/wiringPi all
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/devLib all
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/gpio all
-endef
-
-define WIRINGPI_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true
-endef
-
-define WIRINGPI_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib install DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true
- $(INSTALL) -D -m 0755 $(@D)/gpio/gpio $(TARGET_DIR)/usr/bin/gpio
- $(INSTALL) -D -m 0755 $(@D)/gpio/pintest $(TARGET_DIR)/usr/bin/pintest
-endef
-
-$(eval $(generic-package))
projects / buildroot.git / commitdiff