From 145f225d798a8adb2687544d92f393a37dadbba6 Mon Sep 17 00:00:00 2001 From: Kai Mosebach Date: Mon, 9 Jul 2018 17:11:32 +0200 Subject: [PATCH 1/3] add support for CC via ENV --- install.sh | 4 ++++ patchs/devLib_Makefile.patch | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 89cee74..4b36727 100644 --- a/install.sh +++ b/install.sh @@ -51,6 +51,10 @@ echo "done." patch ./wiringpi/devLib/Makefile < ./patchs/devLib_Makefile.patch patch ./wiringpi/gpio/Makefile < ./patchs/gpio_Makefile.patch +if [ -z "$CC" ]; then + export CC=gcc +fi + echo -n "Making libWiringPi ... " cd ./wiringpi/wiringPi/ make clean >> ../../install.log 2>&1 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 From dbec7168f079a56a3d077ee95a6da30babe6681d Mon Sep 17 00:00:00 2001 From: Kai Mosebach Date: Mon, 9 Jul 2018 17:31:37 +0200 Subject: [PATCH 2/3] add support for CC via ENV --- patchs/gpio_Makefile.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 2bd9bd6da613c85067720ec9753aacdf24579af8 Mon Sep 17 00:00:00 2001 From: Kai Mosebach Date: Mon, 9 Jul 2018 17:42:51 +0200 Subject: [PATCH 3/3] add support for CC via ENV --- install.sh | 1 + patchs/wiringpi_Makefile.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 patchs/wiringpi_Makefile.patch diff --git a/install.sh b/install.sh index 4b36727..b191aec 100644 --- a/install.sh +++ b/install.sh @@ -50,6 +50,7 @@ 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 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