diff --git a/meta/recipes-devtools/subversion/subversion/serfmacro.patch b/meta/recipes-devtools/subversion/subversion/serfmacro.patch index 507de0f08b..a52b8565ff 100644 --- a/meta/recipes-devtools/subversion/subversion/serfmacro.patch +++ b/meta/recipes-devtools/subversion/subversion/serfmacro.patch @@ -1,3 +1,8 @@ +From 1ad0c5a76d6f67a7643c0edc506e1df108362417 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 7 Dec 2016 13:54:18 +0000 +Subject: [PATCH] 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. @@ -9,6 +14,7 @@ Upstream-Status: Pending Rebase 1.12.0 Signed-off-by: Hongxu Jia + --- build/ac-macros/serf.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -26,6 +32,3 @@ index 0a549b3..3a069ac 100644 break else AC_MSG_RESULT([no]) --- -2.7.4 - diff --git a/meta/recipes-devtools/subversion/subversion_1.14.2.bb b/meta/recipes-devtools/subversion/subversion_1.14.3.bb similarity index 97% rename from meta/recipes-devtools/subversion/subversion_1.14.2.bb rename to meta/recipes-devtools/subversion/subversion_1.14.3.bb index ba208d922f..1cf4e1734b 100644 --- a/meta/recipes-devtools/subversion/subversion_1.14.2.bb +++ b/meta/recipes-devtools/subversion/subversion_1.14.3.bb @@ -12,7 +12,7 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://serfmacro.patch \ " -SRC_URI[sha256sum] = "c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28" +SRC_URI[sha256sum] = "949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440" inherit autotools pkgconfig gettext python3native