summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lamego <jose.a.lamego@linux.intel.com>2015-07-03 07:34:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 00:01:23 +0100
commitd93171c060deb6b3d7ea6ccf07810fc523628219 (patch)
tree497668de8e37431aa4134d9dfbaaab9ca5c6e9bd
parent389d010b9a0a158299045befb0259b5131d5666f (diff)
downloadpoky-d93171c060deb6b3d7ea6ccf07810fc523628219.tar.gz
subversion_1.8.13.bb: Regex modified to allow '-D' in paths
Modified the regex sed in serf.m4 to allow the use of '-D' characters in project folder names without having compilation error from subversion-native. [YOCTO #7874] (From OE-Core rev: 04554b128c358e3c10f6581fd4506764a65240b8) Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch28
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.8.13.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch b/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
new file mode 100644
index 0000000000..713b5ebd9b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.8.13/serf.m4-Regex-modified-to-allow-D-in-paths.patch
@@ -0,0 +1,28 @@
1From f1b6e49f12a18eabe88eb732b578a16281d09499 Mon Sep 17 00:00:00 2001
2From: Jose Lamego <jose.a.lamego@linux.intel.com>
3Date: Thu, 2 Jul 2015 11:37:43 +0000
4Subject: [PATCH] serf.m4: Regex modified to allow '-D' in paths
5
6Upstream-Status: Pending
7
8Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
9---
10 build/ac-macros/serf.m4 | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
14index ae11e75..ff8cbae 100644
15--- a/build/ac-macros/serf.m4
16+++ b/build/ac-macros/serf.m4
17@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
18 if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
19 AC_MSG_RESULT([yes])
20 serf_found=yes
21- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
22+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
23 SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs`
24 break
25 else
26--
271.8.4.5
28
diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.8.13.bb
index a98be67fe7..f843b9513c 100644
--- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.8.13.bb
@@ -12,6 +12,7 @@ inherit gettext pythonnative
12SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
13 file://libtool2.patch \ 13 file://libtool2.patch \
14 file://disable_macos.patch \ 14 file://disable_macos.patch \
15 file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
15" 16"
16SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b" 17SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b"
17SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579" 18SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579"