Hitchhiker
/
src
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
src/patches/WiringPi-buildfixes.patch

262 lines
7.7 KiB
Diff
Raw Blame History

diff -ruN WiringPi.old/build WiringPi/build
--- WiringPi.old/build 2020-04-28 11:12:40.772877209 -0400
+++ WiringPi/build 2020-05-01 02:08:44.286610513 -0400
@@ -43,8 +43,6 @@
fi
}
-sudo=${WIRINGPI_SUDO-sudo}
-
if [ x$1 = "xclean" ]; then
cd wiringPi
echo -n "wiringPi: " ; make clean
@@ -72,11 +70,11 @@
if [ x$1 = "xuninstall" ]; then
cd wiringPi
- echo -n "wiringPi: " ; $sudo make uninstall
+ echo -n "wiringPi: " ; make uninstall
cd ../devLib
- echo -n "DevLib: " ; $sudo make uninstall
+ echo -n "DevLib: " ; make uninstall
cd ../gpio
- echo -n "gpio: " ; $sudo make uninstall
+ echo -n "gpio: " ; make uninstall
exit
fi
@@ -128,30 +126,28 @@
echo
echo "WiringPi Library"
cd wiringPi
- $sudo make uninstall
if [ x$1 = "xstatic" ]; then
make -j5 static
check_make_ok
- $sudo make install-static
+ make install-static
else
make -j5
check_make_ok
- $sudo make install
+ make install
fi
check_make_ok
echo
echo "WiringPi Devices Library"
cd ../devLib
- $sudo make uninstall
if [ x$1 = "xstatic" ]; then
make -j5 static
check_make_ok
- $sudo make install-static
+ make install-static
else
make -j5
check_make_ok
- $sudo make install
+ make install
fi
check_make_ok
@@ -160,16 +156,16 @@
cd ../gpio
make -j5
check_make_ok
- $sudo make install
+ make install
check_make_ok
-# echo
-# echo "wiringPi Daemon"
-# cd ../wiringPiD
-# make -j5
-# check_make_ok
-# $sudo make install
-# check_make_ok
+ echo
+ echo "wiringPi Daemon"
+ cd ../wiringPiD
+ make -j5
+ check_make_ok
+ make install
+ check_make_ok
# echo
# echo "Examples"
diff -ruN WiringPi.old/devLib/Makefile WiringPi/devLib/Makefile
--- WiringPi.old/devLib/Makefile 2020-04-28 11:12:40.772877209 -0400
+++ WiringPi/devLib/Makefile 2020-05-01 02:02:06.743591696 -0400
@@ -22,8 +22,7 @@
#################################################################################
VERSION=$(shell cat ../VERSION)
-DESTDIR?=/usr
-PREFIX?=/local
+PREFIX?=/usr
LDCONFIG?=ldconfig
@@ -93,7 +92,7 @@
$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 -ruN WiringPi.old/examples/Gertboard/Makefile WiringPi/examples/Gertboard/Makefile
--- WiringPi.old/examples/Gertboard/Makefile 2020-04-28 11:12:40.782877055 -0400
+++ WiringPi/examples/Gertboard/Makefile 2020-05-01 01:28:21.140110902 -0400
@@ -12,10 +12,10 @@
#DEBUG = -g -O0
DEBUG = -O3
CC = gcc
-INCLUDE = -I/usr/local/include
+INCLUDE = -I/usr/include
CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
-LDFLAGS = -L/usr/local/lib
+LDFLAGS = -L/usr/lib
LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm
# Should not alter anything below this line
diff -ruN WiringPi.old/examples/Makefile WiringPi/examples/Makefile
--- WiringPi.old/examples/Makefile 2020-04-28 11:12:40.782877055 -0400
+++ WiringPi/examples/Makefile 2020-05-01 01:27:52.130110073 -0400
@@ -29,10 +29,10 @@
#DEBUG = -g -O0
DEBUG = -O3
CC = gcc
-INCLUDE = -I/usr/local/include
+INCLUDE = -I/usr/include
CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
-LDFLAGS = -L/usr/local/lib
+LDFLAGS = -L/usr/lib
LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm -lcrypt -lrt
# Should not alter anything below this line
diff -ruN WiringPi.old/examples/PiFace/Makefile WiringPi/examples/PiFace/Makefile
--- WiringPi.old/examples/PiFace/Makefile 2020-04-28 11:12:40.782877055 -0400
+++ WiringPi/examples/PiFace/Makefile 2020-05-01 01:26:15.171913223 -0400
@@ -29,10 +29,10 @@
#DEBUG = -g -O0
DEBUG = -O3
CC = gcc
-INCLUDE = -I/usr/local/include
+INCLUDE = -I/usr/include
CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
-LDFLAGS = -L/usr/local/lib
+LDFLAGS = -L/usr/lib
LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm
# Should not alter anything below this line
diff -ruN WiringPi.old/examples/PiGlow/Makefile WiringPi/examples/PiGlow/Makefile
--- WiringPi.old/examples/PiGlow/Makefile 2020-04-28 11:12:40.782877055 -0400
+++ WiringPi/examples/PiGlow/Makefile 2020-05-01 01:27:21.520702895 -0400
@@ -29,10 +29,10 @@
#DEBUG = -g -O0
DEBUG = -O3
CC = gcc
-INCLUDE = -I/usr/local/include
+INCLUDE = -I/usr/include
CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
-LDFLAGS = -L/usr/local/lib
+LDFLAGS = -L/usr/lib
LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm
# Should not alter anything below this line
diff -ruN WiringPi.old/examples/q2w/Makefile WiringPi/examples/q2w/Makefile
--- WiringPi.old/examples/q2w/Makefile 2020-04-28 11:12:40.782877055 -0400
+++ WiringPi/examples/q2w/Makefile 2020-05-01 01:26:49.051309040 -0400
@@ -29,10 +29,10 @@
#DEBUG = -g -O0
DEBUG = -O3
CC = gcc
-INCLUDE = -I/usr/local/include
+INCLUDE = -I/usr/include
CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
-LDFLAGS = -L/usr/local/lib
+LDFLAGS = -L/usr/lib
LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm
###############################################################################
diff -ruN WiringPi.old/examples/scrollPhat/Makefile WiringPi/examples/scrollPhat/Makefile
--- WiringPi.old/examples/scrollPhat/Makefile 2020-04-28 11:12:40.782877055 -0400
+++ WiringPi/examples/scrollPhat/Makefile 2020-05-01 01:28:44.030287679 -0400
@@ -29,10 +29,10 @@
#DEBUG = -g -O0
DEBUG = -O3
CC = gcc
-INCLUDE = -I/usr/local/include
+INCLUDE = -I/usr/include
CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
-LDFLAGS = -L/usr/local/lib
+LDFLAGS = -L/usr/lib
LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm
# Should not alter anything below this line
diff -ruN WiringPi.old/gpio/Makefile WiringPi/gpio/Makefile
--- WiringPi.old/gpio/Makefile 2020-04-28 11:12:40.782877055 -0400
+++ WiringPi/gpio/Makefile 2020-05-01 02:14:42.900240265 -0400
@@ -23,8 +23,7 @@
# along with wiringPi. If not, see <http://www.gnu.org/licenses/>.
#################################################################################
-DESTDIR?=/usr
-PREFIX?=/local
+PREFIX?=/usr
ifneq ($V,1)
Q ?= @
@@ -72,6 +71,7 @@
.PHONY: install
install: gpio
$Q echo "[Install]"
+ $Q install -d -m 0755 $(DESTDIR)$(PREFIX)/bin
$Q cp gpio $(DESTDIR)$(PREFIX)/bin
ifneq ($(WIRINGPI_SUID),0)
$Q chown root.root $(DESTDIR)$(PREFIX)/bin/gpio
diff -ruN WiringPi.old/wiringPi/Makefile WiringPi/wiringPi/Makefile
--- WiringPi.old/wiringPi/Makefile 2020-04-28 11:12:40.792876901 -0400
+++ WiringPi/wiringPi/Makefile 2020-05-01 01:58:00.868028111 -0400
@@ -22,8 +22,7 @@
#################################################################################
VERSION=$(shell cat ../VERSION)
-DESTDIR?=/usr
-PREFIX?=/local
+PREFIX?=/usr
LDCONFIG?=ldconfig
@@ -101,7 +100,7 @@
$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
diff -ruN WiringPi.old/wiringPiD/Makefile WiringPi/wiringPiD/Makefile
--- WiringPi.old/wiringPiD/Makefile 2020-04-28 11:12:40.802876747 -0400
+++ WiringPi/wiringPiD/Makefile 2020-05-01 01:30:33.860439863 -0400
@@ -22,8 +22,7 @@
# along with wiringPi. If not, see <http://www.gnu.org/licenses/>.
#################################################################################
-DESTDIR?=/usr
-PREFIX?=/local
+PREFIX?=/usr
ifneq ($V,1)
Q ?= @
Reference in New Issue View Git Blame Copy Permalink