| 1 |
commit: 94454a54314e0b471877ee2d1b44d8a6b9128cea |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 9 19:30:02 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 9 19:30:15 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94454a54 |
| 7 |
|
| 8 |
dev-vcs/subversion: fix building against >=dev-libs/apr-1.7.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/682786 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/subversion-1.11.1-allow-apr-1.7.0+.patch | 18 ++++++++++++++++++ |
| 15 |
dev-vcs/subversion/subversion-1.10.4.ebuild | 4 ++++ |
| 16 |
dev-vcs/subversion/subversion-1.11.1.ebuild | 4 ++++ |
| 17 |
dev-vcs/subversion/subversion-1.12.0_rc1.ebuild | 4 ++++ |
| 18 |
dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 4 ++++ |
| 19 |
5 files changed, 34 insertions(+) |
| 20 |
|
| 21 |
diff --git a/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..a0da4a5931d |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch |
| 26 |
@@ -0,0 +1,18 @@ |
| 27 |
+--- a/build/ac-macros/swig.m4 |
| 28 |
++++ b/build/ac-macros/swig.m4 |
| 29 |
+@@ -137,13 +137,13 @@ |
| 30 |
+ AC_CACHE_CHECK([for apr_int64_t Python/C API format string], |
| 31 |
+ [svn_cv_pycfmt_apr_int64_t], [ |
| 32 |
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then |
| 33 |
+- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], |
| 34 |
++ AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd], |
| 35 |
+ [#include <apr.h> |
| 36 |
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd], |
| 37 |
+ [svn_cv_pycfmt_apr_int64_t="L"]) |
| 38 |
+ fi |
| 39 |
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then |
| 40 |
+- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r |
| 41 |
++ AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r |
| 42 |
+ [#include <apr.h> |
| 43 |
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd], |
| 44 |
+ [svn_cv_pycfmt_apr_int64_t="l"]) |
| 45 |
|
| 46 |
diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild |
| 47 |
index 27db0ff68b2..ae74dc6cd38 100644 |
| 48 |
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild |
| 49 |
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild |
| 50 |
@@ -130,6 +130,9 @@ pkg_setup() { |
| 51 |
append-cppflags -DSVN_DEBUG -DAP_DEBUG |
| 52 |
fi |
| 53 |
|
| 54 |
+ # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 |
| 55 |
+ append-cppflags -P |
| 56 |
+ |
| 57 |
# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@××××××××.com%3E |
| 58 |
[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ |
| 59 |
|
| 60 |
@@ -152,6 +155,7 @@ pkg_setup() { |
| 61 |
src_prepare() { |
| 62 |
eapply "${WORKDIR}/patches" |
| 63 |
eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
| 64 |
+ eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch |
| 65 |
eapply_user |
| 66 |
|
| 67 |
fperms +x build/transform_libtool_scripts.sh |
| 68 |
|
| 69 |
diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild |
| 70 |
index a4a22eed915..7510d3694e6 100644 |
| 71 |
--- a/dev-vcs/subversion/subversion-1.11.1.ebuild |
| 72 |
+++ b/dev-vcs/subversion/subversion-1.11.1.ebuild |
| 73 |
@@ -126,6 +126,9 @@ pkg_setup() { |
| 74 |
echo -ne "\a" |
| 75 |
fi |
| 76 |
|
| 77 |
+ # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 |
| 78 |
+ append-cppflags -P |
| 79 |
+ |
| 80 |
if use debug ; then |
| 81 |
append-cppflags -DSVN_DEBUG -DAP_DEBUG |
| 82 |
fi |
| 83 |
@@ -152,6 +155,7 @@ pkg_setup() { |
| 84 |
src_prepare() { |
| 85 |
eapply "${WORKDIR}/patches" |
| 86 |
eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
| 87 |
+ eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch |
| 88 |
eapply_user |
| 89 |
|
| 90 |
fperms +x build/transform_libtool_scripts.sh |
| 91 |
|
| 92 |
diff --git a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild |
| 93 |
index 088d6446ba4..2f0f32c6f26 100644 |
| 94 |
--- a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild |
| 95 |
+++ b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild |
| 96 |
@@ -126,6 +126,9 @@ pkg_setup() { |
| 97 |
echo -ne "\a" |
| 98 |
fi |
| 99 |
|
| 100 |
+ # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 |
| 101 |
+ append-cppflags -P |
| 102 |
+ |
| 103 |
if use debug ; then |
| 104 |
append-cppflags -DSVN_DEBUG -DAP_DEBUG |
| 105 |
fi |
| 106 |
@@ -151,6 +154,7 @@ pkg_setup() { |
| 107 |
|
| 108 |
src_prepare() { |
| 109 |
eapply "${WORKDIR}/patches" |
| 110 |
+ eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch |
| 111 |
eapply_user |
| 112 |
|
| 113 |
fperms +x build/transform_libtool_scripts.sh |
| 114 |
|
| 115 |
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
| 116 |
index ebe11966889..6be305333dd 100644 |
| 117 |
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
| 118 |
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
| 119 |
@@ -89,6 +89,7 @@ PATCHES=( |
| 120 |
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch |
| 121 |
"${FILESDIR}"/${P}-kf5.patch |
| 122 |
"${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
| 123 |
+ "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch |
| 124 |
) |
| 125 |
|
| 126 |
want_apache |
| 127 |
@@ -131,6 +132,9 @@ pkg_setup() { |
| 128 |
echo -ne "\a" |
| 129 |
fi |
| 130 |
|
| 131 |
+ # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 |
| 132 |
+ append-cppflags -P |
| 133 |
+ |
| 134 |
if use debug ; then |
| 135 |
append-cppflags -DSVN_DEBUG -DAP_DEBUG |
| 136 |
fi |
Archives