mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
389d010b9a
commit
d93171c060
@@ -0,0 +1,28 @@
|
|||||||
|
From f1b6e49f12a18eabe88eb732b578a16281d09499 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jose Lamego <jose.a.lamego@linux.intel.com>
|
||||||
|
Date: Thu, 2 Jul 2015 11:37:43 +0000
|
||||||
|
Subject: [PATCH] serf.m4: Regex modified to allow '-D' in paths
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.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 ae11e75..ff8cbae 100644
|
||||||
|
--- a/build/ac-macros/serf.m4
|
||||||
|
+++ b/build/ac-macros/serf.m4
|
||||||
|
@@ -143,7 +143,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
|
||||||
|
if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
serf_found=yes
|
||||||
|
- SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
|
||||||
|
+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/[[:space:]]-D[^ ]*//g' -e 's/^-D[^ ]*//g'`]
|
||||||
|
SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs`
|
||||||
|
break
|
||||||
|
else
|
||||||
|
--
|
||||||
|
1.8.4.5
|
||||||
|
|
||||||
@@ -12,6 +12,7 @@ inherit gettext pythonnative
|
|||||||
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||||
file://libtool2.patch \
|
file://libtool2.patch \
|
||||||
file://disable_macos.patch \
|
file://disable_macos.patch \
|
||||||
|
file://serf.m4-Regex-modified-to-allow-D-in-paths.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b"
|
SRC_URI[md5sum] = "4413417b529d7bdf82f74e50df02e88b"
|
||||||
SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579"
|
SRC_URI[sha256sum] = "1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579"
|
||||||
|
|||||||
Reference in New Issue
Block a user