diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion/serfmacro.patch')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion/serfmacro.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/serfmacro.patch b/meta/recipes-devtools/subversion/subversion/serfmacro.patch new file mode 100644 index 0000000000..9a45cb9a01 --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/serfmacro.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | The existing sed expression can match expressions like | ||
2 | --sysroot=/some/path/xxx-linux/ which clearly isn't intended and | ||
3 | injects incorrect paths into LDFLAGS. | ||
4 | |||
5 | Fix this in the same way we address the problem in CFLAGS. | ||
6 | |||
7 | RP 2016/12/7 | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Index: subversion-1.9.4/build/ac-macros/serf.m4 | ||
11 | =================================================================== | ||
12 | --- subversion-1.9.4.orig/build/ac-macros/serf.m4 | ||
13 | +++ subversion-1.9.4/build/ac-macros/serf.m4 | ||
14 | @@ -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'`] | ||
16 | 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 | ||
18 | - 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'`"] | ||
20 | break | ||
21 | else | ||
22 | AC_MSG_RESULT([no]) | ||