Skip to contentSkip to conversation

fix GNU_HASH QA warnings

PATCH New Yi Zhao 1 participant 3 messages Aug 18, 2016

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

cover fix GNU_HASH QA warnings

The following changes since commit 02a390b79bdc089eb583e443ee04f60bffd409eb:

tnftp: tnftp20130505 -> tnftp20151004 (2016-08-16 21:26:15 -0400)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib yzhao/hash-fix
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/hash-fix

Yi Zhao (2):
libx86-1: fix QA warning for GNU_HASH
wipe: fix QA warning for GNU_HASH

 .../libx86-1/libx86-1.1/makefile-add-ldflags.patch      | 17 +++++++++++++++++
 meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb       |  1 +
 .../wipe/files/makefile-add-ldflags.patch               | 17 +++++++++++++++++
 meta-oe/recipes-extended/wipe/wipe_git.bb               |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch
 create mode 100644 meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 libx86-1: fix QA warning for GNU_HASH

Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable.

---
 .../libx86-1/libx86-1.1/makefile-add-ldflags.patch      | 17 +++++++++++++++++
 meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb       |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch
meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch new file +17 -0
new file mode 100644
index 0000000..821ab37
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <[email protected]>
+
+diff --git a/Makefile b/Makefile
+index 951b617..6d9b73d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ static: $(OBJECTS)
+ 	$(AR) cru libx86.a $(OBJECTS)
+ 
+ shared: $(OBJECTS)
+-	$(CC) $(CFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS)
+ 
+ objclean:
+ 	$(MAKE) -C x86emu clean
meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb +1 -0
index 20c152c..d303147 100644
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=633af6c02e6f624d4c472d970a2aca53"
 SRC_URI = "http://www.codon.org.uk/~mjg59/libx86/downloads/${BPN}-${PV}.tar.gz \
            file://libx86-mmap-offset.patch \
            file://0001-assume-zero-is-valid-address.patch \
+           file://makefile-add-ldflags.patch \
 "
 
 SRC_URI[md5sum] = "41bee1f8e22b82d82b5f7d7ba51abc2a"
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/2 wipe: fix QA warning for GNU_HASH

In reply to Yi Zhao

Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable.

---
 .../wipe/files/makefile-add-ldflags.patch               | 17 +++++++++++++++++
 meta-oe/recipes-extended/wipe/wipe_git.bb               |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch
meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch new file +17 -0
new file mode 100644
index 0000000..fac1b31
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <[email protected]>
+
+diff --git a/Makefile b/Makefile
+index 9e74cdf..cad8109 100644
+--- a/Makefile
++++ b/Makefile
+@@ -151,7 +151,7 @@ generic	:
+ 		$(MAKE) $(TARGETS) "CC=$(CC_GENERIC)" "CCO=$(CCO_GENERIC)" "CCOC=$(CCOC_GENERIC)"
+ 
+ wipe	:	$(OBJECTS)
+-		$(CC) $(CCO) $(OBJECTS) -o wipe
++		$(CC) $(CCO) $(LDFLAGS) $(OBJECTS) -o wipe
+ 
+ wipe.o	:	wipe.c random.h misc.h version.h
+ 		$(CC) $(CCO) $(CCOC) wipe.c -o wipe.o
meta-oe/recipes-extended/wipe/wipe_git.bb +1 -0
index 70229f0..dd49958 100644
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 SRC_URI = "git://github.com/berke/wipe.git;branch=master \
            file://support-cross-compile-for-linux.patch \
+           file://makefile-add-ldflags.patch \
           "
 SRCREV = "d9c100c9cd0b1cbbe4359e4d6c9a035d11e7597c"
 PV = "0.23+git${SRCPV}"
Signature · 1 line
2.7.4