Updated pigpio

This commit is contained in:
layman
2019-03-05 17:43:08 +01:00
parent 761d30af91
commit ab3bb9906b
4 changed files with 24 additions and 84 deletions
@@ -1,42 +0,0 @@
--- 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
@@ -1,20 +0,0 @@
--- 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:
@@ -1,6 +1,6 @@
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
--- pigpio-9999.orig/Makefile 2019-03-05 12:26:57.330266931 +0100
+++ pigpio-9999/Makefile 2019-03-05 17:15:42.301814015 +0100
@@ -1,15 +1,6 @@
#
# Set CROSS_PREFIX to prepend to all compiler tools at once for easier
@@ -14,10 +14,10 @@ diff -ur pigpio-9999.orig/Makefile pigpio-9999/Makefile
-SHLIB = $(CC) -shared
-STRIPLIB = $(STRIP) --strip-unneeded
-
CFLAGS += -O3 -Wall -pthread
SOVERSION = 1
LIB1 = libpigpio.so
@@ -36,7 +27,7 @@
CFLAGS += -O3 -Wall -pthread
@@ -38,7 +29,7 @@
bindir = $(exec_prefix)/bin
includedir = $(prefix)/include
libdir = $(prefix)/lib
@@ -26,17 +26,21 @@ diff -ur pigpio-9999.orig/Makefile pigpio-9999/Makefile
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
@@ -103,8 +94,6 @@
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 $(PYINSTALLARGS); fi
- if which python3; then python3 setup.py install $(PYINSTALLARGS); fi
install -m 0755 -d $(DESTDIR)$(mandir)/man1
install -m 0644 *.1 $(DESTDIR)$(mandir)/man1
install -m 0755 -d $(DESTDIR)$(mandir)/man3
@@ -126,8 +115,6 @@
rm -f $(DESTDIR)$(bindir)/pig2vcd
rm -f $(DESTDIR)$(bindir)/pigpiod
rm -f $(DESTDIR)$(bindir)/pigs
- if which python2; then python2 setup.py install $(PYINSTALLARGS) --record /tmp/pigpio >/dev/null; sed 's!^!$(DESTDIR)!' < /tmp/pigpio | xargs rm -f >/dev/null; fi
- if which python3; then python3 setup.py install $(PYINSTALLARGS) --record /tmp/pigpio >/dev/null; sed 's!^!$(DESTDIR)!' < /tmp/pigpio | xargs rm -f >/dev/null; fi
rm -f $(DESTDIR)$(mandir)/man1/pig*.1
rm -f $(DESTDIR)$(mandir)/man1/libpigpio*.1
rm -f $(DESTDIR)$(mandir)/man3/pig*.3