summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-05-12 16:16:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-12 17:55:11 +0100
commit8e7b9685d2d27511aef2cf1ce51d688337fbd31a (patch)
tree8f7e9d722eeab43be3eafd152ced44e795ebaa15 /meta
parent0ac1bb797a0793f8835f4da64c361dcb820f2ee1 (diff)
downloadpoky-8e7b9685d2d27511aef2cf1ce51d688337fbd31a.tar.gz
subversion: upgrade 1.11.1 -> 1.12.0
- Backport a patch to fix build failure while APR 1.7.0 ... checking for apr_int64_t Python/C API format string... configure: error: failed to recognize APR_INT64_T_FMT on this platform ... - Rebase disable_macos.patch and serfmacro.patch License-update: no change, declare two new added file * in build/ac-macros/ax_boost_base.m4 * in build/ac-macros/ax_boost_unit_test_framework.m4 (From OE-Core rev: 68ae5e624642218e7e01805c096da09098a8706f) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/subversion/subversion/disable_macos.patch45
-rw-r--r--meta/recipes-devtools/subversion/subversion/serfmacro.patch27
-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.0.bb (renamed from meta/recipes-devtools/subversion/subversion_1.11.1.bb)7
4 files changed, 153 insertions, 33 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/disable_macos.patch b/meta/recipes-devtools/subversion/subversion/disable_macos.patch
index ec3be496f3..8d2d635992 100644
--- a/meta/recipes-devtools/subversion/subversion/disable_macos.patch
+++ b/meta/recipes-devtools/subversion/subversion/disable_macos.patch
@@ -1,15 +1,25 @@
1These tests don't work in cross compiling, just disable them for now, we don't 1From 9c350c037ca3489dbeece6ecc2d7e2e5dbb177e9 Mon Sep 17 00:00:00 2001
2build subversion on OS-X at this time. 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 15:21:46 +0800
4Subject: [PATCH] These tests don't work in cross compiling, just disable them
5 for now, we don't build subversion on OS-X at this time.
3 6
4RP 1014/7/16 7RP 1014/7/16
5 8
6Upstream-Status: Pending [needs a rewrite to support a cache value] 9Upstream-Status: Pending [needs a rewrite to support a cache value]
7 10
8Index: subversion-1.8.9/build/ac-macros/macosx.m4 11Rebase to 1.12.0
9=================================================================== 12
10--- subversion-1.8.9.orig/build/ac-macros/macosx.m4 2012-11-26 03:04:27.000000000 +0000 13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11+++ subversion-1.8.9/build/ac-macros/macosx.m4 2014-07-16 12:28:58.357300403 +0000 14---
12@@ -24,21 +24,7 @@ 15 build/ac-macros/macosx.m4 | 31 +------------------------------
16 1 file changed, 1 insertion(+), 30 deletions(-)
17
18diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4
19index 92fa58e..a568e1c 100644
20--- a/build/ac-macros/macosx.m4
21+++ b/build/ac-macros/macosx.m4
22@@ -24,21 +24,7 @@ dnl Check for _dyld_image_name and _dyld_image_header availability
13 AC_DEFUN(SVN_LIB_MACHO_ITERATE, 23 AC_DEFUN(SVN_LIB_MACHO_ITERATE,
14 [ 24 [
15 AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) 25 AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
@@ -31,7 +41,7 @@ Index: subversion-1.8.9/build/ac-macros/macosx.m4
31 ]) 41 ])
32 42
33 dnl SVN_LIB_MACOS_PLIST 43 dnl SVN_LIB_MACOS_PLIST
34@@ -46,34 +32,7 @@ 44@@ -46,23 +32,8 @@ dnl Assign variables for Mac OS property list support
35 AC_DEFUN(SVN_LIB_MACOS_PLIST, 45 AC_DEFUN(SVN_LIB_MACOS_PLIST,
36 [ 46 [
37 AC_MSG_CHECKING([for Mac OS property list utilities]) 47 AC_MSG_CHECKING([for Mac OS property list utilities])
@@ -44,25 +54,18 @@ Index: subversion-1.8.9/build/ac-macros/macosx.m4
44- #error ProperyList API unavailable. 54- #error ProperyList API unavailable.
45- #endif 55- #endif
46- ]],[[]])],[ 56- ]],[[]])],[
47- dnl ### Hack. We should only need to pass the -framework options when 57- SVN_MACOS_PLIST_LIBS="-framework CoreFoundation"
48- dnl linking libsvn_subr, since it is the only library that uses Keychain. 58- AC_SUBST(SVN_MACOS_PLIST_LIBS)
49- dnl
50- dnl Unfortunately, libtool 1.5.x doesn't track transitive dependencies for
51- dnl OS X frameworks like it does for normal libraries, so we need to
52- dnl explicitly pass the option to all the users of libsvn_subr to allow
53- dnl static builds to link successfully.
54- dnl
55- dnl This does mean that all executables we link will be linked directly
56- dnl to these frameworks - even when building shared libraries - but that
57- dnl shouldn't cause any problems.
58-
59- LIBS="$LIBS -framework CoreFoundation"
60- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1], 59- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
61- [Is Mac OS property list API available?]) 60- [Is Mac OS property list API available?])
62- AC_MSG_RESULT([yes]) 61- AC_MSG_RESULT([yes])
63- ],[ 62- ],[
63+ AC_SUBST([SVN_MACOS_PLIST_LIBS], [""])
64 AC_MSG_RESULT([no]) 64 AC_MSG_RESULT([no])
65- ]) 65- ])
66 ]) 66 ])
67 67
68 dnl SVN_LIB_MACOS_KEYCHAIN 68 dnl SVN_LIB_MACOS_KEYCHAIN
69--
702.7.4
71
diff --git a/meta/recipes-devtools/subversion/subversion/serfmacro.patch b/meta/recipes-devtools/subversion/subversion/serfmacro.patch
index 9a45cb9a01..507de0f08b 100644
--- a/meta/recipes-devtools/subversion/subversion/serfmacro.patch
+++ b/meta/recipes-devtools/subversion/subversion/serfmacro.patch
@@ -1,22 +1,31 @@
1The existing sed expression can match expressions like 1The existing sed expression can match expressions like
2--sysroot=/some/path/xxx-linux/ which clearly isn't intended and 2--sysroot=/some/path/xxx-linux/ which clearly isn't intended and injects
3injects incorrect paths into LDFLAGS. 3incorrect paths into LDFLAGS.
4 4
5Fix this in the same way we address the problem in CFLAGS. 5Fix this in the same way we address the problem in CFLAGS.
6 6
7RP 2016/12/7 7RP 2016/12/7
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10Index: subversion-1.9.4/build/ac-macros/serf.m4 10Rebase 1.12.0
11=================================================================== 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12--- subversion-1.9.4.orig/build/ac-macros/serf.m4 12---
13+++ subversion-1.9.4/build/ac-macros/serf.m4 13 build/ac-macros/serf.m4 | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/build/ac-macros/serf.m4 b/build/ac-macros/serf.m4
17index 0a549b3..3a069ac 100644
18--- a/build/ac-macros/serf.m4
19+++ b/build/ac-macros/serf.m4
14@@ -171,7 +171,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, 20@@ -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'`] 21 SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`]
16 SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` 22 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 23 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'`"] 24- 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'`"] 25+ LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/ -l[^ ]*//g' -e 's/^-l[^ ]*//g'`"]
20 break 26 break
21 else 27 else
22 AC_MSG_RESULT([no]) 28 AC_MSG_RESULT([no])
29--
302.7.4
31
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
new file mode 100644
index 0000000000..f0edd5fe8a
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
@@ -0,0 +1,107 @@
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.11.1.bb b/meta/recipes-devtools/subversion/subversion_1.12.0.bb
index 8abac7408e..f059ff9ffa 100644
--- a/meta/recipes-devtools/subversion/subversion_1.11.1.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.12.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Subversion (svn) version control system client"
2HOMEPAGE = "http://subversion.apache.org" 2HOMEPAGE = "http://subversion.apache.org"
3SECTION = "console/network" 3SECTION = "console/network"
4LICENSE = "Apache-2 & MIT" 4LICENSE = "Apache-2 & MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=83206f39819e7a4dfca2ff7c190f6ce0" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=6487ae7094d359fa90fb9c4096e52e2b"
6 6
7DEPENDS = "apr-util serf sqlite3 file lz4" 7DEPENDS = "apr-util serf sqlite3 file lz4"
8DEPENDS_append_class-native = " file-replacement-native" 8DEPENDS_append_class-native = " file-replacement-native"
@@ -11,10 +11,11 @@ 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 \
14 " 15 "
15 16
16SRC_URI[md5sum] = "5797bf701d2d868fa964c7bbc4931267" 17SRC_URI[md5sum] = "be4f5c0b1b38a5d82bd6d16a16ff1346"
17SRC_URI[sha256sum] = "9efd2750ca4d72ec903431a24b9c732b6cbb84aad9b7563f59dd96dea5be60bb" 18SRC_URI[sha256sum] = "7fae7c73d8a007c107c0ae5eb372bc0bb013dbfe966fcd5c59cd5a195a5e2edf"
18 19
19inherit autotools pkgconfig gettext 20inherit autotools pkgconfig gettext
20 21