cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

libcanfestival: Don't force -fhonour-opts

Browse Source 
-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: 317c2469d9 ("libcanfestival: fix several small build process issues")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli
2017-06-04 19:16:11 -07:00
parent a8a7a2329c
commit 657be0880b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libcanfestival/Makefile
+1 -1
View File
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libcanfestival PKG_NAME:=libcanfestival
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE_VERSION:=8bfe0ac00cdb PKG_SOURCE_VERSION:=8bfe0ac00cdb
PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3/archive/$(PKG_SOURCE_VERSION).tar.bz2?_dummyfilename= PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3/archive/$(PKG_SOURCE_VERSION).tar.bz2?_dummyfilename=
libs/libcanfestival/patches/004-honour-copts.patch → libs/libcanfestival/patches/004-override-cflags.patch
+4 -4
View File
@@ -5,7 +5,7 @@
CC = SUB_CC CC = SUB_CC
OPT_CFLAGS = -O2 OPT_CFLAGS = -O2
-CFLAGS = SUB_OPT_CFLAGS -CFLAGS = SUB_OPT_CFLAGS
+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts +CFLAGS ?= SUB_OPT_CFLAGS
PROG_CFLAGS = SUB_PROG_CFLAGS PROG_CFLAGS = SUB_PROG_CFLAGS
PREFIX = SUB_PREFIX PREFIX = SUB_PREFIX
TARGET = SUB_TARGET TARGET = SUB_TARGET
@@ -16,7 +16,7 @@
else else
-CFLAGS = SUB_OPT_CFLAGS -CFLAGS = SUB_OPT_CFLAGS
+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts +CFLAGS ?= SUB_OPT_CFLAGS
ifeq ($(TARGET),none) ifeq ($(TARGET),none)
canfestival: libcanfestival.o canfestival: libcanfestival.o
@@ -27,7 +27,7 @@
else else
-CFLAGS = SUB_OPT_CFLAGS -CFLAGS = SUB_OPT_CFLAGS
+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts +CFLAGS ?= SUB_OPT_CFLAGS
driver: libcanfestival_$(TARGET).a driver: libcanfestival_$(TARGET).a
@@ -38,7 +38,7 @@
CC = SUB_CC CC = SUB_CC
OPT_CFLAGS = -O2 OPT_CFLAGS = -O2
-CFLAGS = SUB_OPT_CFLAGS -CFLAGS = SUB_OPT_CFLAGS
+CFLAGS = SUB_OPT_CFLAGS -fhonour-copts +CFLAGS ?= SUB_OPT_CFLAGS
PROG_CFLAGS = SUB_PROG_CFLAGS PROG_CFLAGS = SUB_PROG_CFLAGS
OS_NAME = SUB_OS_NAME OS_NAME = SUB_OS_NAME
ARCH_NAME = SUB_ARCH_NAME ARCH_NAME = SUB_ARCH_NAME