From 657be0880b95b42214ec9f7ea477c6ecc14fb1fa Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 4 Jun 2017 19:16:11 -0700 Subject: [PATCH] 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 +- .../{004-honour-copts.patch => 004-override-cflags.patch} | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename libs/libcanfestival/patches/{004-honour-copts.patch => 004-override-cflags.patch} (83%) 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-override-cflags.patch similarity index 83% rename from libs/libcanfestival/patches/004-honour-copts.patch rename to libs/libcanfestival/patches/004-override-cflags.patch index 117bd2f21..8dfb39600 100644 --- a/libs/libcanfestival/patches/004-honour-copts.patch +++ b/libs/libcanfestival/patches/004-override-cflags.patch @@ -5,7 +5,7 @@ CC = SUB_CC OPT_CFLAGS = -O2 -CFLAGS = SUB_OPT_CFLAGS -+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts ++CFLAGS ?= SUB_OPT_CFLAGS PROG_CFLAGS = SUB_PROG_CFLAGS PREFIX = SUB_PREFIX TARGET = SUB_TARGET @@ -16,7 +16,7 @@ else -CFLAGS = SUB_OPT_CFLAGS -+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts ++CFLAGS ?= SUB_OPT_CFLAGS ifeq ($(TARGET),none) canfestival: libcanfestival.o @@ -27,7 +27,7 @@ else -CFLAGS = SUB_OPT_CFLAGS -+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts ++CFLAGS ?= SUB_OPT_CFLAGS driver: libcanfestival_$(TARGET).a @@ -38,7 +38,7 @@ CC = SUB_CC OPT_CFLAGS = -O2 -CFLAGS = SUB_OPT_CFLAGS -+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts ++CFLAGS ?= SUB_OPT_CFLAGS PROG_CFLAGS = SUB_PROG_CFLAGS OS_NAME = SUB_OS_NAME ARCH_NAME = SUB_ARCH_NAME