libcanfestival: Don't force -fhonour-opts

-fhonour-copts is an OpenWrt/LEDE toolchain specific patch, forcing it
will make external toolchain fail to build this package. What we need
instead is a way to override CFLAGS from the different Makefile files so
rename the patch to illustrate that.

Fixes: 317c2469d923 ("libcanfestival: fix several small build process issues")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/libs/libcanfestival/Makefile b/libs/libcanfestival/Makefile
index 9b2821db7411ac970f9e0c6d793ca49185e67d84..bb70f6022d155e193e4898f9c12c47c8d593e3ef 100644 (file)
--- a/libs/libcanfestival/Makefile
+++ b/libs/libcanfestival/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcanfestival
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE_VERSION:=8bfe0ac00cdb
 PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3/archive/$(PKG_SOURCE_VERSION).tar.bz2?_dummyfilename=

diff --git a/libs/libcanfestival/patches/004-honour-copts.patch b/libs/libcanfestival/patches/004-honour-copts.patch
deleted file mode 100644 (file)
index 117bd2f..0000000
--- a/libs/libcanfestival/patches/004-honour-copts.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/can_socket/Makefile.in
-+++ b/drivers/can_socket/Makefile.in
-@@ -23,7 +23,7 @@
- 
- CC = SUB_CC
- OPT_CFLAGS = -O2
--CFLAGS = SUB_OPT_CFLAGS
-+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts
- PROG_CFLAGS = SUB_PROG_CFLAGS
- PREFIX = SUB_PREFIX
- TARGET = SUB_TARGET
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -101,7 +101,7 @@ uninstall:
-       rm -rf $(DESTDIR)$(PREFIX)/include/canfestival
- 
- else
--CFLAGS = SUB_OPT_CFLAGS
-+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts
- 
- ifeq ($(TARGET),none)
- canfestival: libcanfestival.o
---- a/drivers/unix/Makefile.in
-+++ b/drivers/unix/Makefile.in
-@@ -85,7 +85,7 @@ install:
- 
- 
- else
--CFLAGS = SUB_OPT_CFLAGS
-+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts
- 
- driver: libcanfestival_$(TARGET).a
- 
---- a/drivers/timers_unix/Makefile.in
-+++ b/drivers/timers_unix/Makefile.in
-@@ -23,7 +23,7 @@
- 
- CC = SUB_CC
- OPT_CFLAGS = -O2
--CFLAGS = SUB_OPT_CFLAGS
-+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts
- PROG_CFLAGS = SUB_PROG_CFLAGS
- OS_NAME = SUB_OS_NAME
- ARCH_NAME = SUB_ARCH_NAME

diff --git a/libs/libcanfestival/patches/004-override-cflags.patch b/libs/libcanfestival/patches/004-override-cflags.patch
new file mode 100644 (file)
index 0000000..8dfb396
--- /dev/null
+++ b/libs/libcanfestival/patches/004-override-cflags.patch
@@ -0,0 +1,44 @@
+--- a/drivers/can_socket/Makefile.in
++++ b/drivers/can_socket/Makefile.in
+@@ -23,7 +23,7 @@
+ 
+ CC = SUB_CC
+ OPT_CFLAGS = -O2
+-CFLAGS = SUB_OPT_CFLAGS
++CFLAGS ?= SUB_OPT_CFLAGS
+ PROG_CFLAGS = SUB_PROG_CFLAGS
+ PREFIX = SUB_PREFIX
+ TARGET = SUB_TARGET
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -101,7 +101,7 @@ uninstall:
+       rm -rf $(DESTDIR)$(PREFIX)/include/canfestival
+ 
+ else
+-CFLAGS = SUB_OPT_CFLAGS
++CFLAGS ?= SUB_OPT_CFLAGS
+ 
+ ifeq ($(TARGET),none)
+ canfestival: libcanfestival.o
+--- a/drivers/unix/Makefile.in
++++ b/drivers/unix/Makefile.in
+@@ -85,7 +85,7 @@ install:
+ 
+ 
+ else
+-CFLAGS = SUB_OPT_CFLAGS
++CFLAGS ?= SUB_OPT_CFLAGS
+ 
+ driver: libcanfestival_$(TARGET).a
+ 
+--- a/drivers/timers_unix/Makefile.in
++++ b/drivers/timers_unix/Makefile.in
+@@ -23,7 +23,7 @@
+ 
+ CC = SUB_CC
+ OPT_CFLAGS = -O2
+-CFLAGS = SUB_OPT_CFLAGS
++CFLAGS ?= SUB_OPT_CFLAGS
+ PROG_CFLAGS = SUB_PROG_CFLAGS
+ OS_NAME = SUB_OS_NAME
+ ARCH_NAME = SUB_ARCH_NAME