lio-utils: Fix GNU_HASH QA errors

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit df3d2beaf9e5d4cfc31b2b1e209dc1d8e3956fd3)
Signed-off-by: Armin Kuster <akuster808@gmail.com>

2 files changed, 64 insertions, 1 deletions

diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
new file mode 100644
index 000000000..9608b7e75
--- /dev/null
+++ b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
@@ -0,0 +1,61 @@
+From 2cc2315eecaa48fd24792aaa889dc7d9fb96978b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 20 Mar 2017 22:18:44 -0700
+Subject: [PATCH] Makefiles: Respect environment variables and add LDFLAGS to
+ linker cmdline
+
+Fixes QA errors about GNU_HASH
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ mib-modules/Makefile | 10 +++++-----
+ tools/Makefile       |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/mib-modules/Makefile b/mib-modules/Makefile
+index 0d54c9b..051d4d2 100644
+--- a/mib-modules/Makefile
++++ b/mib-modules/Makefile
+@@ -17,13 +17,13 @@ TARG                = iscsiTargetMib.so
+ OBJS           = iscsiTargetMib.o iscsiMib.o scsiMib.o ipsAuthMib.o \
+                iscsiAuthData.o
+ 
+-CC             = gcc
+-CFLAGS         = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
++CC             ?= gcc
++CFLAGS         += -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
+ CFLAGS         += -I../include -Wall -Werror
+ #CFLAGS                +=$(AUTO_CFLAGS)
+ 
+-LD             = gcc -shared
+-
++LD             ?= gcc
++LDFLAGS                += -shared
+ INSTALL                = install
+ 
+ all: $(TARG)
+@@ -32,7 +32,7 @@ all: $(TARG)
+        $(CC) $(CFLAGS) -o $@ -c $<
+ 
+ $(TARG): $(OBJS)
+-       $(LD) -o $@ $(OBJS)
++       $(LD) -o $@ $(OBJS) $(LDFLAGS)
+ 
+ clean:
+        rm -f $(OBJS) $(TARG)
+diff --git a/tools/Makefile b/tools/Makefile
+index 79ed3cd..ffd9bf3 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -6,7 +6,7 @@ ISCSI_NAME_OBJS      = $(ISCSI_NAME_SRCS:.c=.o)
+ all:: $(ISCSI_NAME) 
+ 
+ $(ISCSI_NAME): $(ISCSI_NAME_OBJS)
+-       $(CC) -o $@ $(CFLAGS) $(ISCSI_NAME_OBJS) 
++       $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(ISCSI_NAME_OBJS) 
+ 
+ clean:
+        rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME) 
+-- 
+2.12.0
+
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
index 35ba16141..3a6319c31 100644
--- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
+++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df
 
 PV = "4.1+git${SRCPV}"
 
-SRC_URI = "git://risingtidesystems.com/lio-utils.git"
+SRC_URI = "git://risingtidesystems.com/lio-utils.git \
+           file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \
+           "
 SRCREV = "28bd928655bdc7bd3cf380f0196630690c51e05f"
 S = "${WORKDIR}/git"