Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 08face4353d80111973aba9c1304c92158cfad0e Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 28 Mar 2017 16:40:12 +0300 |
| 4 | Subject: [PATCH] Take linking flags from LDFLAGS env var |
| 5 | |
| 6 | This fixes "No GNU_HASH in the elf binary" issues. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [oe-core specific] |
| 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 10 | --- |
| 11 | Configurations/unix-Makefile.tmpl | 2 +- |
| 12 | Configure | 2 +- |
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl |
| 16 | index c029817..43b769b 100644 |
| 17 | --- a/Configurations/unix-Makefile.tmpl |
| 18 | +++ b/Configurations/unix-Makefile.tmpl |
| 19 | @@ -173,7 +173,7 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} |
| 20 | CC= $(CROSS_COMPILE){- $target{cc} -} |
| 21 | CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -} |
| 22 | CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} |
| 23 | -LDFLAGS= {- $target{lflags} -} |
| 24 | +LDFLAGS= {- $target{lflags}." ".$ENV{'LDFLAGS'} -} |
| 25 | PLIB_LDFLAGS= {- $target{plib_lflags} -} |
| 26 | EX_LIBS= {- $target{ex_libs} -} {- $config{ex_libs} -} |
| 27 | LIB_CFLAGS={- $target{shared_cflag} || "" -} |
| 28 | diff --git a/Configure b/Configure |
| 29 | index aee7cc3..274d236 100755 |
| 30 | --- a/Configure |
| 31 | +++ b/Configure |
| 32 | @@ -979,7 +979,7 @@ $config{build_file} = $target{build_file}; |
| 33 | $config{defines} = []; |
| 34 | $config{cflags} = ""; |
| 35 | $config{ex_libs} = ""; |
| 36 | -$config{shared_ldflag} = ""; |
| 37 | +$config{shared_ldflag} = $ENV{'LDFLAGS'}; |
| 38 | |
| 39 | # Make sure build_scheme is consistent. |
| 40 | $target{build_scheme} = [ $target{build_scheme} ] |
| 41 | -- |
| 42 | 2.11.0 |
| 43 | |