diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-08-22 08:58:10 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:35:52 +0100 |
commit | 00536009bdf5b4df2fefe64c2eee4db3bdef3150 (patch) | |
tree | 2845698189dc3d0b20a079a4315dfe8a8c8fdb12 | |
parent | ff7a4cabfe85cb766bf1e0fcbfbef8b867c58dc8 (diff) | |
download | poky-00536009bdf5b4df2fefe64c2eee4db3bdef3150.tar.gz |
sysvinit: Fix makefile bug found with clang
This is due to specifying .h files on linker cmdline
clang driver is picky about it, and its not entirely correct
either
(From OE-Core rev: de45b5e68faeefe3d68818d456f280b98f397634)
(From OE-Core rev: 44dcee60e343944199ee766ec0886931ff2b0699)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch | 52 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch b/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch new file mode 100644 index 0000000000..f35c15cb31 --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 36ac97bfe51797458442a6035219a504a42e703a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 21 Aug 2015 10:56:40 -0700 | ||
4 | Subject: [PATCH] This fixes an issue that clang reports about mutliple output | ||
5 | files | ||
6 | |||
7 | Issue is that we are passing .h file to link step as seen below. | ||
8 | |||
9 | | arm-oe-linux-gnueabi-clang -march=armv7-a -mthumb -mfloat-abi=hard | ||
10 | -mfpu=neon-vfpv4 -mtune=cortex-a7 -D__extern_always_inline=inline | ||
11 | -no-integrated-as | ||
12 | --sysroot=/mnt/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-glibc/sysroots/raspberrypi2 | ||
13 | -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed halt.o ifdown.o hddown.o | ||
14 | utmp.o reboot.h -o halt | ||
15 | | clang-3.7: error: cannot specify -o when generating multiple output | ||
16 | files | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | |||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | --- | ||
22 | src/Makefile | 6 +++--- | ||
23 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
24 | |||
25 | diff --git a/src/Makefile b/src/Makefile | ||
26 | index e77ed5f..a6f9f40 100644 | ||
27 | --- a/src/Makefile | ||
28 | +++ b/src/Makefile | ||
29 | @@ -103,9 +103,9 @@ all: $(BIN) $(SBIN) $(USRBIN) | ||
30 | init: LDLIBS += $(INITLIBS) $(STATIC) | ||
31 | init: init.o init_utmp.o | ||
32 | |||
33 | -halt: halt.o ifdown.o hddown.o utmp.o reboot.h | ||
34 | +halt: halt.o ifdown.o hddown.o utmp.o | ||
35 | |||
36 | -last: last.o oldutmp.h | ||
37 | +last: last.o | ||
38 | |||
39 | mesg: mesg.o | ||
40 | |||
41 | @@ -120,7 +120,7 @@ sulogin: sulogin.o | ||
42 | |||
43 | wall: dowall.o wall.o | ||
44 | |||
45 | -shutdown: dowall.o shutdown.o utmp.o reboot.h | ||
46 | +shutdown: dowall.o shutdown.o utmp.o | ||
47 | |||
48 | bootlogd: LDLIBS += -lutil | ||
49 | bootlogd: bootlogd.o | ||
50 | -- | ||
51 | 2.1.4 | ||
52 | |||
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index 6709a9be3a..5dfe39e233 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \ | |||
13 | file://install.patch \ | 13 | file://install.patch \ |
14 | file://crypt-lib.patch \ | 14 | file://crypt-lib.patch \ |
15 | file://pidof-add-m-option.patch \ | 15 | file://pidof-add-m-option.patch \ |
16 | file://0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch \ | ||
16 | file://rcS-default \ | 17 | file://rcS-default \ |
17 | file://rc \ | 18 | file://rc \ |
18 | file://rcS \ | 19 | file://rcS \ |