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