xref: /OK3568_Linux_fs/yocto/poky/meta/recipes-devtools/subversion/subversion/serfmacro.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1The existing sed expression can match expressions like
2--sysroot=/some/path/xxx-linux/ which clearly isn't intended and injects
3incorrect paths into LDFLAGS.
4
5Fix this in the same way we address the problem in CFLAGS.
6
7RP 2016/12/7
8Upstream-Status: Pending
9
10Rebase 1.12.0
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 build/ac-macros/serf.m4 | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
17index 0a549b3..3a069ac 100644
18--- a/build/ac-macros/serf.m4
19+++ b/build/ac-macros/serf.m4
20@@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
21           SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
22           SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`]
23           dnl don't use --libs-only-L because then we might miss some options
24-          LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
25+          LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/ -l[^ ]*//g' -e 's/^-l[^ ]*//g'`"]
26           break
27         else
28           AC_MSG_RESULT([no])
29--
302.7.4
31
32