diff options
| author | Adrian Dudau <adrian.dudau@enea.com> | 2016-09-19 14:59:13 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-26 08:29:13 +0200 |
| commit | 0de66c207c0b633401ab88fe66bbf478b3ac7754 (patch) | |
| tree | 33854af4ef9c54c5132dc51786be09c737bff933 | |
| parent | 9c9cee62e981e173366328e4503085e180bf7bb5 (diff) | |
| download | meta-openembedded-0de66c207c0b633401ab88fe66bbf478b3ac7754.tar.gz | |
openl2tp: Obey LDFLAGS in Makefile
This avoids a "QA Issue: No GNU_HASH in the elf binary"
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch | 15 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb | 1 |
2 files changed, 16 insertions, 0 deletions
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 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | --- openl2tp-1.8/Makefile.orig 2016-09-16 14:54:18.554291976 +0200 | ||
| 4 | +++ openl2tp-1.8/Makefile 2016-09-16 14:57:23.559090400 +0200 | ||
| 5 | @@ -157,8 +157,8 @@ ADD_CFLAGS= -I. -Iusl -Icli -isystem i | ||
| 6 | -MMD -Wall -Wno-strict-aliasing \ | ||
| 7 | $(ADD_CPPFLAGS) $(CPPFLAGS.dmalloc) \ | ||
| 8 | -DSYS_LIBDIR=$(SYS_LIBDIR) | ||
| 9 | -LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc | ||
| 10 | -LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc | ||
| 11 | +LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc $(LDFLAGS) | ||
| 12 | +LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc $(LDFLAGS) | ||
| 13 | |||
| 14 | OPT_CFLAGS?= -O | ||
| 15 | |||
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" | |||
| 14 | SRC_URI = "http://ftp.jaist.ac.jp/pub/sourceforge/o/op/${PN}/${PN}/${PV}/${BP}.tar.gz \ | 14 | SRC_URI = "http://ftp.jaist.ac.jp/pub/sourceforge/o/op/${PN}/${PN}/${PV}/${BP}.tar.gz \ |
| 15 | file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \ | 15 | file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \ |
| 16 | file://openl2tp-simplify-gcc-warning-hack.patch \ | 16 | file://openl2tp-simplify-gcc-warning-hack.patch \ |
| 17 | file://Makefile-obey-LDFLAGS.patch \ | ||
| 17 | " | 18 | " |
| 18 | SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" | 19 | SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" |
| 19 | SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" | 20 | SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" |