summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-05 17:50:01 +0000
committerArmin Kuster <akuster808@gmail.com>2017-08-04 20:36:16 -0700
commit8949f33f77cfef3eaaa6ec7d55c347f6114a6c30 (patch)
tree2714b942ec3fc1312a0f84728106b9f9e9822bd5
parenta0843ce8ce946336c6f215ac17f6daca832cdf5c (diff)
downloadmeta-openembedded-8949f33f77cfef3eaaa6ec7d55c347f6114a6c30.tar.gz
logfsprogs: Pass LDFLAGS to link steps
Fixes QA errors about missing GNU_HASH Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit e562c3adeb230bd5c99ff3d9d47eb84af99f509b) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch46
-rw-r--r--meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb4
2 files changed, 49 insertions, 1 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 @@
1From a322794f80f2718ae4463669c4b6ab2fbb15ffec Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Apr 2017 17:36:45 +0000
4Subject: [PATCH] Add $(LDFLAGS) to linker cmdline
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 Makefile | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11Index: 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 32ebec83d..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"
11LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02" 11LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02"
12DEPENDS = "zlib" 12DEPENDS = "zlib"
13 13
14SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git" 14SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \
15 file://0001-Add-LDFLAGS-to-linker-cmdline.patch \
16"
15SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4" 17SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4"
16 18
17S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"