Several updates and new packages

This commit is contained in:
layman
2017-05-19 09:53:18 +02:00
parent 2d1b0a55dd
commit 32a2ecd537
28 changed files with 688 additions and 14 deletions
@@ -0,0 +1,29 @@
--- pigpio-9999/MakeRemote
+++ pigpio-9999/MakeRemote
@@ -1,8 +1,4 @@
#
-CC = gcc
-SIZE = size
-SHLIB = gcc -shared
-STRIPLIB = strip --strip-unneeded
CFLAGS += -O3 -Wall -pthread
@@ -9,7 +9,7 @@
bindir = $(exec_prefix)/bin
includedir = $(prefix)/include
libdir = $(prefix)/lib
-mandir = $(prefix)/man
+mandir = $(prefix)/share/man
all: $(ALL) pigpio.py setup.py
@@ -48,8 +44,6 @@
install -m 0644 libpigpiod_if2.so $(DESTDIR)$(libdir)
install -m 0755 -d $(DESTDIR)$(bindir)
install -m 0755 pigs $(DESTDIR)$(bindir)
- python2 setup.py install
- python3 setup.py install
install -m 0755 -d $(DESTDIR)$(mandir)/man1
install -m 0644 *.1 $(DESTDIR)$(mandir)/man1
install -m 0755 -d $(DESTDIR)$(mandir)/man3
@@ -0,0 +1,42 @@
--- pigpio-44/Makefile
+++ pigpio-44/Makefile
@@ -1,10 +1,4 @@
#
-CC = gcc
-AR = ar
-RANLIB = ranlib
-SIZE = size
-SHLIB = gcc -shared
-STRIPLIB = strip --strip-unneeded
CFLAGS += -O3 -Wall -pthread
@@ -32,7 +26,7 @@
bindir = $(exec_prefix)/bin
includedir = $(prefix)/include
libdir = $(prefix)/lib
-mandir = $(prefix)/man
+mandir = $(prefix)/share/man
all: $(ALL)
@@ -80,16 +74,13 @@
install -m 0755 libpigpiod_if.so $(DESTDIR)$(libdir)
install -m 0755 libpigpiod_if2.so $(DESTDIR)$(libdir)
install -m 0755 -d $(DESTDIR)$(bindir)
- install -m 0755 -s pig2vcd $(DESTDIR)$(bindir)
- install -m 0755 -s pigpiod $(DESTDIR)$(bindir)
- install -m 0755 -s pigs $(DESTDIR)$(bindir)
- if which python2; then python2 setup.py install; fi
- if which python3; then python3 setup.py install; fi
+ install -m 0755 pig2vcd $(DESTDIR)$(bindir)
+ install -m 0755 pigpiod $(DESTDIR)$(bindir)
+ install -m 0755 pigs $(DESTDIR)$(bindir)
install -m 0755 -d $(DESTDIR)$(mandir)/man1
install -m 0644 *.1 $(DESTDIR)$(mandir)/man1
install -m 0755 -d $(DESTDIR)$(mandir)/man3
install -m 0644 *.3 $(DESTDIR)$(mandir)/man3
- ldconfig
uninstall:
rm -f $(DESTDIR)$(includedir)/pigpio.h
@@ -0,0 +1,20 @@
--- pigpio-44/pigpio.c
+++ pigpio-44/pigpio.c
@@ -6269,7 +6269,7 @@
tp->id,
(unsigned)tp->nextTick.tv_sec,
(unsigned)tp->nextTick.tv_nsec);
- fprintf(stderr, buf);
+ fprintf(stderr, "%s", buf);
}
}
@@ -6360,7 +6360,7 @@
break;
case 5:
- fprintf(outFifo, cmdUsage);
+ fprintf(outFifo, "%s", cmdUsage);
break;
case 6:
@@ -0,0 +1,42 @@
diff -ur pigpio-9999.orig/Makefile pigpio-9999/Makefile
--- pigpio-9999.orig/Makefile 2016-11-04 10:17:06.305474989 +0100
+++ pigpio-9999/Makefile 2016-11-04 10:19:41.936609643 +0100
@@ -1,15 +1,6 @@
#
# Set CROSS_PREFIX to prepend to all compiler tools at once for easier
# cross-compilation.
-CROSS_PREFIX =
-CC = $(CROSS_PREFIX)gcc
-AR = $(CROSS_PREFIX)ar
-RANLIB = $(CROSS_PREFIX)ranlib
-SIZE = $(CROSS_PREFIX)size
-STRIP = $(CROSS_PREFIX)strip
-SHLIB = $(CC) -shared
-STRIPLIB = $(STRIP) --strip-unneeded
-
CFLAGS += -O3 -Wall -pthread
LIB1 = libpigpio.so
@@ -36,7 +27,7 @@
bindir = $(exec_prefix)/bin
includedir = $(prefix)/include
libdir = $(prefix)/lib
-mandir = $(prefix)/man
+mandir = $(prefix)/share/man
all: $(ALL)
@@ -90,13 +81,10 @@
install -m 0755 pig2vcd $(DESTDIR)$(bindir)
install -m 0755 pigpiod $(DESTDIR)$(bindir)
install -m 0755 pigs $(DESTDIR)$(bindir)
- if which python2; then python2 setup.py install; fi
- if which python3; then python3 setup.py install; fi
install -m 0755 -d $(DESTDIR)$(mandir)/man1
install -m 0644 *.1 $(DESTDIR)$(mandir)/man1
install -m 0755 -d $(DESTDIR)$(mandir)/man3
install -m 0644 *.3 $(DESTDIR)$(mandir)/man3
- ldconfig
uninstall:
rm -f $(DESTDIR)$(includedir)/pigpio.h