[oe-commits] [meta-openembedded] 35/35: logfsprogs: Pass LDFLAGS to link steps

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 428022106da248bb353f723c21f54ce99b55df1b
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Wed Apr 5 17:50:01 2017 +0000

    logfsprogs: Pass LDFLAGS to link steps
    
    Fixes QA errors about missing GNU_HASH
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../0001-Add-LDFLAGS-to-linker-cmdline.patch       | 46 ++++++++++++++++++++++
 .../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 0000000..30ad1b8
--- /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 at 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 at 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 7648667..c41f0ea 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"
@@ -24,6 +26,3 @@ do_install () {
 }
 
 BBCLASSEXTEND = "native nativesdk"
-
-# 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]
-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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.