[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3574/8267] subversion: Fix issues in LDFLAGS sed manipulation

[Emmanuele Bassi <ebassi src gnome org>]

commit 862d6db9d333813d2ab18288fc687d502f42484c
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Dec 7 13:54:18 2016 +0000

    subversion: Fix issues in LDFLAGS sed manipulation
    
    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. This fixes corrupt
    build paths and incorrect paths in .la files amongst other issues.
    
    (From OE-Core rev: 9a8382422ddbb0972dc25b752204f4908bb9857c)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../subversion/subversion/serfmacro.patch          |   22 ++++++++++++++++++++
 .../subversion/subversion_1.9.4.bb                 |    1 +
 2 files changed, 23 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 0000000..9a45cb9
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion/serfmacro.patch
@@ -0,0 +1,22 @@
+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
+@@ -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` 
+           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])
diff --git a/meta/recipes-devtools/subversion/subversion_1.9.4.bb 
b/meta/recipes-devtools/subversion/subversion_1.9.4.bb
index fa6a7f2..3e35940 100644
--- a/meta/recipes-devtools/subversion/subversion_1.9.4.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.9.4.bb
@@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
            file://0001-Fix-libtool-name-in-configure.ac.patch \
            file://0001-fix-svnadmin-create-fail-on-x86.patch \
+           file://serfmacro.patch \
            "
 
 SRC_URI[md5sum] = "29121a038f87641055a8183f49e9739f"