Skip to content

Commit

Permalink
linuxconsole: Fix makefile issue found with clang
Browse files Browse the repository at this point in the history
Signed-off-by: Khem Raj <[email protected]>
Cc: Wang Mingyu <[email protected]>
  • Loading branch information
kraj committed Apr 14, 2022
1 parent 7a48dca commit fe1bb59
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 25f54c3359a0fa34890030662e9b02e0a9745f4f Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
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 <[email protected]>
---
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

Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit fe1bb59

Please sign in to comment.