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 @@ -The existing sed expression can match expressions like ---sysroot=/some/path/xxx-linux/ which clearly isn't intended and -injects incorrect paths into LDFLAGS. +The existing sed expression can match expressions like +--sysroot=/some/path/xxx-linux/ which clearly isn't intended and injects +incorrect paths into LDFLAGS. Fix this in the same way we address the problem in CFLAGS. RP 2016/12/7 Upstream-Status: Pending -Index: subversion-1.9.4/build/ac-macros/serf.m4 -=================================================================== ---- subversion-1.9.4.orig/build/ac-macros/serf.m4 -+++ subversion-1.9.4/build/ac-macros/serf.m4 +Rebase 1.12.0 +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/ac-macros/serf.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4 +index 0a549b3..3a069ac 100644 +--- a/build/ac-macros/serf.m4 ++++ b/build/ac-macros/serf.m4 @@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, - SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`] - SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` + SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`] + SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`] dnl don't use --libs-only-L because then we might miss some options - LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"] + LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/ -l[^ ]*//g' -e 's/^-l[^ ]*//g'`"] break else AC_MSG_RESULT([no]) +-- +2.7.4 + |