diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-04-13 21:02:04 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-04-14 19:42:10 -0700 |
| commit | 884f5aed87b022a381141b805583cbef149e5083 (patch) | |
| tree | 6e909187b26eecce76c84ff323c3f5554c069321 /meta-oe/recipes-extended | |
| parent | 08d9e915425a5ce02b9caff7264a0841f2b56fa3 (diff) | |
| download | meta-openembedded-contrib-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>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/linuxconsole/linuxconsole/0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb | 1 |
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 @@ +From 25f54c3359a0fa34890030662e9b02e0a9745f4f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 20:57:38 -0700 +Subject: [PATCH] utils: Use name of the first prerequisite in rule + +Use $< instead of $^ because the latter will specify both pre-requisite +inputattach.c serio-ids.h files on same compiler cmdline and clang does +not like that and errors out like below + +clang-14: error: cannot specify -o when generating multiple output files + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + utils/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/utils/Makefile b/utils/Makefile +index 1fc51ab..a7434a9 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -46,10 +46,10 @@ endif + evdev-joystick: evdev-joystick.c + + inputattach: inputattach.c serio-ids.h +- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) $(SYSTEMDFLAGS) -lm -o $@ + + ffcfstress: ffcfstress.c bitmaskros.h +- $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $< $(LDFLAGS) -lm -o $@ + + ffmvforce.o: ffmvforce.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `$(PKG_CONFIG) --cflags sdl2` +-- +2.35.2 + 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)}" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/linuxconsole/linuxconsoletools-${PV}.tar.bz2 \ + file://0001-utils-Use-name-of-the-first-prerequisite-in-rule.patch \ file://51-these-are-not-joysticks-rm.rules \ file://60-joystick.rules \ file://inputattachctl \ |