summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-08-27 08:51:59 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 11:31:21 +0100
commitb0efa1952c7eee4fbf834042e290ab804492ba9d (patch)
tree71a5c60b0ad49af02408b0de1ad53c207fd61b77 /meta/recipes-devtools
parent18176f5cc2b2b5969b41bcd867886e968bc7cfcb (diff)
downloadpoky-b0efa1952c7eee4fbf834042e290ab804492ba9d.tar.gz
subversion: Upgrade 1.12.0 -> 1.12.2
Remove backported patch. (From OE-Core rev: 947828b8e9c4f332533d1d6bd0750ff018d51295) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch107
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.12.2.bb (renamed from meta/recipes-devtools/subversion/subversion_1.12.0.bb)5
2 files changed, 2 insertions, 110 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch b/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
deleted file mode 100644
index f0edd5fe8a..0000000000
--- a/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
+++ /dev/null
@@ -1,107 +0,0 @@
1From b147803553237654f8268e831dee8fed4989ad3b Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 14:46:39 +0800
4Subject: [PATCH] Submitted By: Pierre Labastie (pierre dot labastie at neuf
5 dot fr) Date: 2019-04-17 Initial Package Version: 1.11.1 Origin: Upstream
6 revision 1857391 Upstream Status: Committed Description: Get rid of
7 apr_int64_t format string check in swig py configure.
8
9This check relied on APR implementation details and broke with APR 1.7.0.
10Rather than trying to guess a perfect format string to use, just use the
11largest possible format and cast the argument accordingly.
12
13Should fix build against APR 1.7.0 and later.
14
15Suggested by: brane
16
17* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT.
18
19* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
20 (svn_swig_py_client_blame_receiver_func): Stop relying on the
21 SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and
22 acast to PY_LONG_LONG instead.
23
24Upstream-Status: Backport [www.linuxfromscratch.org/patches/blfs/svn/subversion-1.12.0-apr_1.7.0_fix-1.patch]
25
26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27---
28 build/ac-macros/swig.m4 | 35 ----------------------
29 .../swig/python/libsvn_swig_py/swigutil_py.c | 9 +++---
30 2 files changed, 4 insertions(+), 40 deletions(-)
31
32diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
33index 55501fb..2963872 100644
34--- a/build/ac-macros/swig.m4
35+++ b/build/ac-macros/swig.m4
36@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG,
37 ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
38 ])
39 SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
40-
41- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
42- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
43- dnl thus the egrep patterns have a + in them.
44- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
45- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
46- AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
47- [svn_cv_pycfmt_apr_int64_t], [
48- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
49- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
50- [#include <apr.h>
51- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
52- [svn_cv_pycfmt_apr_int64_t="L"])
53- fi
54- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
55- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
56- [#include <apr.h>
57- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
58- [svn_cv_pycfmt_apr_int64_t="l"])
59- fi
60- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
61- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
62- [#include <apr.h>
63- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
64- [svn_cv_pycfmt_apr_int64_t="i"])
65- fi
66- ])
67- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
68- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
69- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
70- fi
71- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
72- ["$svn_cv_pycfmt_apr_int64_t"],
73- [Define to the Python/C API format character suitable]
74- [ for apr_int64_t])
75 fi
76
77 if test "$PERL" != "none"; then
78diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
79index 2c90a6a..abe5a2a 100644
80--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
81+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
82@@ -46,7 +46,7 @@
83 #include "svn_mergeinfo.h"
84 #include "svn_types.h"
85
86-#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */
87+#include "svn_private_config.h"
88
89 #include "swig_python_external_runtime.swg"
90 #include "swigutil_py.h"
91@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton,
92 svn_swig_py_acquire_py_lock();
93
94 if ((result = PyObject_CallFunction(receiver,
95- (char *)
96- (SVN_APR_INT64_T_PYCFMT "lsssO&"),
97- line_no, revision, author, date, line,
98- make_ob_pool, pool)) == NULL)
99+ (char *)"LlsssO&",
100+ (PY_LONG_LONG)line_no, revision, author,
101+ date, line, make_ob_pool, pool)) == NULL)
102 {
103 err = callback_exception_error();
104 }
105--
1062.7.4
107
diff --git a/meta/recipes-devtools/subversion/subversion_1.12.0.bb b/meta/recipes-devtools/subversion/subversion_1.12.2.bb
index f1ac1dcfdc..4ffa1c584e 100644
--- a/meta/recipes-devtools/subversion/subversion_1.12.0.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.12.2.bb
@@ -11,11 +11,10 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
11 file://disable_macos.patch \ 11 file://disable_macos.patch \
12 file://0001-Fix-libtool-name-in-configure.ac.patch \ 12 file://0001-Fix-libtool-name-in-configure.ac.patch \
13 file://serfmacro.patch \ 13 file://serfmacro.patch \
14 file://subversion-1.12.0-apr_1.7.0_fix-1.patch \
15 " 14 "
16 15
17SRC_URI[md5sum] = "be4f5c0b1b38a5d82bd6d16a16ff1346" 16SRC_URI[md5sum] = "1ff249f848f834ded88536543e031975"
18SRC_URI[sha256sum] = "7fae7c73d8a007c107c0ae5eb372bc0bb013dbfe966fcd5c59cd5a195a5e2edf" 17SRC_URI[sha256sum] = "3bd0b5c8e4c5175263dc9a92fd9aef94ce917e80af034f26fe5c45fde7e0f771"
19 18
20inherit autotools pkgconfig gettext 19inherit autotools pkgconfig gettext
21 20