diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-05 17:50:01 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-06 13:00:30 +0200 |
commit | e562c3adeb230bd5c99ff3d9d47eb84af99f509b (patch) | |
tree | 74a0b9a8679dec1acc404c21b2086a5c388e6e86 | |
parent | 147046ced77e106dacb896fc7c879e0fc507c6b1 (diff) | |
download | meta-openembedded-e562c3adeb230bd5c99ff3d9d47eb84af99f509b.tar.gz |
logfsprogs: Pass LDFLAGS to link steps
Fixes QA errors about missing GNU_HASH
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch | 46 | ||||
-rw-r--r-- | meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb | 7 |
2 files changed, 49 insertions, 4 deletions
diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch new file mode 100644 index 000000000..30ad1b8ad --- /dev/null +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From a322794f80f2718ae4463669c4b6ab2fbb15ffec Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Apr 2017 17:36:45 +0000 | ||
4 | Subject: [PATCH] Add $(LDFLAGS) to linker cmdline | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Makefile | 4 ++-- | ||
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | Index: git/Makefile | ||
12 | =================================================================== | ||
13 | --- git.orig/Makefile | ||
14 | +++ git/Makefile | ||
15 | @@ -14,7 +14,7 @@ ZLIB_O := crc32.o deflate.o adler32.o co | ||
16 | CC := gcc | ||
17 | CHECK := cgcc | ||
18 | CHECKFLAGS := -D__CHECK_ENDIAN__ | ||
19 | -CFLAGS := -std=gnu99 | ||
20 | +CFLAGS += -std=gnu99 | ||
21 | CFLAGS += -Wall | ||
22 | CFLAGS += -Os | ||
23 | CFLAGS += -D_FILE_OFFSET_BITS=64 | ||
24 | @@ -28,18 +28,18 @@ $(ZLIB_O): /usr/lib/libz.a | ||
25 | |||
26 | ifdef S | ||
27 | EXTRA_OBJ := $(ZLIB_O) | ||
28 | -CFLAGS += -static | ||
29 | +LDFLAGS += -static | ||
30 | else | ||
31 | -CFLAGS += -lz | ||
32 | +LDFLAGS += -lz | ||
33 | endif | ||
34 | |||
35 | mklogfs: $(EXTRA_OBJ) | ||
36 | mklogfs: mkfs.o lib.o btree.o segment.o readwrite.o | ||
37 | - $(CC) $(CFLAGS) -o $@ $^ | ||
38 | + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) | ||
39 | |||
40 | logfsck: $(ZLIB_O) | ||
41 | logfsck: fsck.o lib.o journal.o super.o | ||
42 | - $(CC) $(CFLAGS) -o $@ $^ | ||
43 | + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) | ||
44 | |||
45 | $(OBJ): kerncompat.h logfs.h logfs_abi.h btree.h | ||
46 | |||
diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index 764866708..c41f0eaa6 100644 --- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb | |||
@@ -11,7 +11,9 @@ LICENSE = "GPLv2" | |||
11 | LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02" | 11 | LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02" |
12 | DEPENDS = "zlib" | 12 | DEPENDS = "zlib" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git" | 14 | SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \ |
15 | file://0001-Add-LDFLAGS-to-linker-cmdline.patch \ | ||
16 | " | ||
15 | SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" | 17 | SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" |
16 | 18 | ||
17 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
@@ -24,6 +26,3 @@ do_install () { | |||
24 | } | 26 | } |
25 | 27 | ||
26 | BBCLASSEXTEND = "native nativesdk" | 28 | BBCLASSEXTEND = "native nativesdk" |
27 | |||
28 | # logfsprogs-git: No GNU_HASH in the elf binary: '/tmp/work/armv5te-oe-linux-gnueabi/logfsprogs/git-r0/packages-split/logfsprogs/usr/bin/mklogfs' [ldflags] | ||
29 | PNBLACKLIST[logfsprogs] ?= "Doesn't have proper PV, doesn't respect LDFLAGS - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||