summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-04-13 21:02:04 -0700
committerKhem Raj <raj.khem@gmail.com>2022-04-14 19:42:10 -0700
commit884f5aed87b022a381141b805583cbef149e5083 (patch)
tree6e909187b26eecce76c84ff323c3f5554c069321
parent08d9e915425a5ce02b9caff7264a0841f2b56fa3 (diff)
downloadmeta-openembedded-884f5aed87b022a381141b805583cbef149e5083.tar.gz
linuxconsole: Fix makefile issue found with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Wang Mingyu <wangmy@fujitsu.com>
-rw-r--r--meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch37
-rw-r--r--meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb1
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch b/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch
new file mode 100644
index 0000000000..bbfed0fd82
--- /dev/null
+++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch
@@ -0,0 +1,37 @@
1From 25f54c3359a0fa34890030662e9b02e0a9745f4f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Apr 2022 20:57:38 -0700
4Subject: [PATCH] utils: Use name of the first prerequisite in rule
5
6Use $< instead of $^ because the latter will specify both pre-requisite
7inputattach.c serio-ids.h files on same compiler cmdline and clang does
8not like that and errors out like below
9
10clang-14: error: cannot specify -o when generating multiple output files
11
12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 utils/Makefile | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/utils/Makefile b/utils/Makefile
19index 1fc51ab..a7434a9 100644
20--- a/utils/Makefile
21+++ b/utils/Makefile
22@@ -46,10 +46,10 @@ endif
23 evdev-joystick: evdev-joystick.c
24
25 inputattach: inputattach.c serio-ids.h
26- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@
27+ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@
28
29 ffcfstress: ffcfstress.c bitmaskros.h
30- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@
31+ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) -lm -o $@
32
33 ffmvforce.o: ffmvforce.c
34 $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `$(PKG_CONFIG) --cflags sdl2`
35--
362.35.2
37
diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
index f213b7859e..5716817e95 100644
--- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
+++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
@@ -12,6 +12,7 @@ DEPENDS = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
12 12
13SRC_URI = "\ 13SRC_URI = "\
14 ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ 14 ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \
15 file://0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch \
15 file://51-these-are-not-joysticks-rm.rules \ 16 file://51-these-are-not-joysticks-rm.rules \
16 file://60-joystick.rules \ 17 file://60-joystick.rules \
17 file://inputattachctl \ 18 file://inputattachctl \