summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-07 13:54:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-08 10:31:29 +0000
commit862d6db9d333813d2ab18288fc687d502f42484c (patch)
treef6bb678aebd0d114ce0c3b07b711fa03fd14f7c5
parentace9e1d37124a294d72ad75a71d36098cfe6eac4 (diff)
downloadpoky-862d6db9d333813d2ab18288fc687d502f42484c.tar.gz
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>
-rw-r--r--meta/recipes-devtools/subversion/subversion/serfmacro.patch22
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.9.4.bb1
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 0000000000..9a45cb9a01
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion/serfmacro.patch
@@ -0,0 +1,22 @@
1The existing sed expression can match expressions like
2--sysroot=/some/path/xxx-linux/ which clearly isn't intended and
3injects incorrect 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
10Index: 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])
diff --git a/meta/recipes-devtools/subversion/subversion_1.9.4.bb b/meta/recipes-devtools/subversion/subversion_1.9.4.bb
index fa6a7f238c..3e35940755 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 \
15 file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \ 15 file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
16 file://0001-Fix-libtool-name-in-configure.ac.patch \ 16 file://0001-Fix-libtool-name-in-configure.ac.patch \
17 file://0001-fix-svnadmin-create-fail-on-x86.patch \ 17 file://0001-fix-svnadmin-create-fail-on-x86.patch \
18 file://serfmacro.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "29121a038f87641055a8183f49e9739f" 21SRC_URI[md5sum] = "29121a038f87641055a8183f49e9739f"