summaryrefslogtreecommitdiff
path: root/recipes-devtools
diff options
context:
space:
mode:
authorStefan Müller-Klieser <S.Mueller-Klieser@phytec.de>2016-06-28 12:08:47 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-06-28 15:30:00 +0200
commitd81fb542525d4f9f40e8a4c048b62746734166e7 (patch)
treebebff20fad5ccb7831c73b6834688d428b63b56c /recipes-devtools
parentf2b39567a8c496d5070706c7f6f51a4bd273d348 (diff)
downloadmeta-yogurt-d81fb542525d4f9f40e8a4c048b62746734166e7.tar.bz2
meta-yogurt-d81fb542525d4f9f40e8a4c048b62746734166e7.zip
flashbench: fix Makefile
Add patch to assign compiler default settings as conditional. This is required as Poky changed the default make call. Make '-e' is not the default any more. Makefile variable overrides need to be explicit. Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/flashbench/flashbench/0001-flashbench-fix-Makefile.patch33
-rw-r--r--recipes-devtools/flashbench/flashbench_git.bb3
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-devtools/flashbench/flashbench/0001-flashbench-fix-Makefile.patch b/recipes-devtools/flashbench/flashbench/0001-flashbench-fix-Makefile.patch
new file mode 100644
index 0000000..efa2dbf
--- /dev/null
+++ b/recipes-devtools/flashbench/flashbench/0001-flashbench-fix-Makefile.patch
@@ -0,0 +1,33 @@
+From 99fabbd9f6bd68eadadbb3e48120c38a599fa5ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
+Date: Mon, 20 Jun 2016 11:36:03 +0200
+Subject: [PATCH] flashbench: fix Makefile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Assign compiler defaults as conditional. This removes the requirement
+to explicitly override those variables, e.g. for a cross-compile setup.
+
+Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f83b220..45c59a3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+-CC := gcc
+-CFLAGS := -O2 -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -g2
+-LDFLAGS := -lrt
++CC ?= gcc
++CFLAGS ?= -O2 -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -g2
++LDFLAGS ?= -lrt
+
+ all: flashbench erase
+
+--
+1.9.1
+
diff --git a/recipes-devtools/flashbench/flashbench_git.bb b/recipes-devtools/flashbench/flashbench_git.bb
index 5933272..9783546 100644
--- a/recipes-devtools/flashbench/flashbench_git.bb
+++ b/recipes-devtools/flashbench/flashbench_git.bb
@@ -12,6 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
S = "${WORKDIR}/git"
SRC_URI = "git://git.linaro.org/people/arnd.bergmann/flashbench.git;protocol=https"
+SRC_URI += "\
+ file://0001-flashbench-fix-Makefile.patch \
+"
# There are no upstream tags/releases.
SRCREV = "2e30b1968a66147412f21002ea844122a0d5e2f0"