From 657be0880b95b42214ec9f7ea477c6ecc14fb1fa Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 4 Jun 2017 19:16:11 -0700 Subject: 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 --- libs/libcanfestival/Makefile | 2 +- libs/libcanfestival/patches/004-honour-copts.patch | 44 ---------------------- .../patches/004-override-cflags.patch | 44 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 libs/libcanfestival/patches/004-honour-copts.patch create mode 100644 libs/libcanfestival/patches/004-override-cflags.patch (limited to 'libs/libcanfestival') diff --git a/libs/libcanfestival/Makefile b/libs/libcanfestival/Makefile index 9b2821db7..bb70f6022 100644 --- 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 index 117bd2f21..000000000 --- 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 index 000000000..8dfb39600 --- /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 -- cgit v1.2.3