aboutsummaryrefslogtreecommitdiffstats
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-contrib-8949f33f77cfef3eaaa6ec7d55c347f6114a6c30.tar.gz
meta-openembedded-contrib-8949f33f77cfef3eaaa6ec7d55c347f6114a6c30.tar.bz2
meta-openembedded-contrib-8949f33f77cfef3eaaa6ec7d55c347f6114a6c30.zip
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 0000000000..30ad1b8ad6
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch
@@ -0,0 +1,46 @@
+From a322794f80f2718ae4463669c4b6ab2fbb15ffec Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 5 Apr 2017 17:36:45 +0000
+Subject: [PATCH] Add $(LDFLAGS) to linker cmdline
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -14,7 +14,7 @@ ZLIB_O := crc32.o deflate.o adler32.o co
+ CC := gcc
+ CHECK := cgcc
+ CHECKFLAGS := -D__CHECK_ENDIAN__
+-CFLAGS := -std=gnu99
++CFLAGS += -std=gnu99
+ CFLAGS += -Wall
+ CFLAGS += -Os
+ CFLAGS += -D_FILE_OFFSET_BITS=64
+@@ -28,18 +28,18 @@ $(ZLIB_O): /usr/lib/libz.a
+
+ ifdef S
+ EXTRA_OBJ := $(ZLIB_O)
+-CFLAGS += -static
++LDFLAGS += -static
+ else
+-CFLAGS += -lz
++LDFLAGS += -lz
+ endif
+
+ mklogfs: $(EXTRA_OBJ)
+ mklogfs: mkfs.o lib.o btree.o segment.o readwrite.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+ logfsck: $(ZLIB_O)
+ logfsck: fsck.o lib.o journal.o super.o
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+ $(OBJ): kerncompat.h logfs.h logfs_abi.h btree.h
+
diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
index 32ebec83d6..c41f0eaa60 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"
LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02"
DEPENDS = "zlib"
-SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git"
+SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \
+ file://0001-Add-LDFLAGS-to-linker-cmdline.patch \
+"
SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4"
S = "${WORKDIR}/git"