From 0de66c207c0b633401ab88fe66bbf478b3ac7754 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Mon, 19 Sep 2016 14:59:13 +0200 Subject: openl2tp: Obey LDFLAGS in Makefile This avoids a "QA Issue: No GNU_HASH in the elf binary" Signed-off-by: Adrian Dudau Signed-off-by: Martin Jansa --- .../openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch | 15 +++++++++++++++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 1 + 2 files changed, 16 insertions(+) create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch new file mode 100644 index 0000000000..811faddd01 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch @@ -0,0 +1,15 @@ +Upstream-Status: Pending + +--- openl2tp-1.8/Makefile.orig 2016-09-16 14:54:18.554291976 +0200 ++++ openl2tp-1.8/Makefile 2016-09-16 14:57:23.559090400 +0200 +@@ -157,8 +157,8 @@ ADD_CFLAGS= -I. -Iusl -Icli -isystem i + -MMD -Wall -Wno-strict-aliasing \ + $(ADD_CPPFLAGS) $(CPPFLAGS.dmalloc) \ + -DSYS_LIBDIR=$(SYS_LIBDIR) +-LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc +-LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc ++LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc $(LDFLAGS) ++LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc $(LDFLAGS) + + OPT_CFLAGS?= -O + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index d043b63898..270472efba 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -14,6 +14,7 @@ DEPENDS = "popt flex readline" SRC_URI = "http://ftp.jaist.ac.jp/pub/sourceforge/o/op/${PN}/${PN}/${PV}/${BP}.tar.gz \ file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \ file://openl2tp-simplify-gcc-warning-hack.patch \ + file://Makefile-obey-LDFLAGS.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" -- cgit 1.2.3-korg