diff --git a/install.sh b/install.sh index 89cee74..b191aec 100644 --- a/install.sh +++ b/install.sh @@ -50,6 +50,11 @@ echo "done." patch ./wiringpi/devLib/Makefile < ./patchs/devLib_Makefile.patch patch ./wiringpi/gpio/Makefile < ./patchs/gpio_Makefile.patch +patch ./wiringpi/wiringPi/Makefile < ./patchs/wiringpi_Makefile.patch + +if [ -z "$CC" ]; then + export CC=gcc +fi echo -n "Making libWiringPi ... " cd ./wiringpi/wiringPi/ diff --git a/patchs/devLib_Makefile.patch b/patchs/devLib_Makefile.patch index cb9fc41..a587d29 100644 --- a/patchs/devLib_Makefile.patch +++ b/patchs/devLib_Makefile.patch @@ -11,7 +11,8 @@ @@ -33,7 +34,7 @@ #DEBUG = -g -O0 DEBUG = -O2 - CC = gcc +-CC = gcc ++CC ?= gcc -INCLUDE = -I. +INCLUDE = -I. -I$(PWD)/../wiringPi DEFS = -D_GNU_SOURCE diff --git a/patchs/gpio_Makefile.patch b/patchs/gpio_Makefile.patch index e50bfe0..dfd7093 100644 --- a/patchs/gpio_Makefile.patch +++ b/patchs/gpio_Makefile.patch @@ -8,7 +8,8 @@ #DEBUG = -g -O0 DEBUG = -O2 - CC = gcc +-CC = gcc ++CC ?= gcc -INCLUDE = -I$(DESTDIR)$(PREFIX)/include +INCLUDE = -I$(PWD)/../wiringPi -I$(PWD)/../devLib CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe diff --git a/patchs/wiringpi_Makefile.patch b/patchs/wiringpi_Makefile.patch new file mode 100644 index 0000000..eef273f --- /dev/null +++ b/patchs/wiringpi_Makefile.patch @@ -0,0 +1,11 @@ +--- ./wiringpi/wiringPi/Makefile 2018-07-09 17:41:41.230429060 +0200 ++++ ./wiringpi/wiringPi/Makefile_orig 2018-07-09 17:40:09.449485572 +0200 +@@ -30,7 +30,7 @@ + + #DEBUG = -g -O0 + DEBUG = -O2 ++CC ?= gcc +-CC = gcc + INCLUDE = -I. + DEFS = -D_GNU_SOURCE + CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC