| 1 |
commit: 5c65a2dac4c2fbe6027aa7350b40f2dd54d4ae04 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 7 00:08:03 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 7 00:08:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c65a2da |
| 7 |
|
| 8 |
dev-vcs/subversion: fix build with >=dev-libs/libutf8proc-2.5.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/721300 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-vcs/subversion/subversion-1.13.0-r1.ebuild | 7 +++++++ |
| 14 |
1 file changed, 7 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild |
| 17 |
index 9534bafbacb..3cf9f17eab2 100644 |
| 18 |
--- a/dev-vcs/subversion/subversion-1.13.0-r1.ebuild |
| 19 |
+++ b/dev-vcs/subversion/subversion-1.13.0-r1.ebuild |
| 20 |
@@ -154,6 +154,9 @@ pkg_setup() { |
| 21 |
} |
| 22 |
|
| 23 |
src_prepare() { |
| 24 |
+ # https://bugs.gentoo.org/721300 |
| 25 |
+ rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die |
| 26 |
+ |
| 27 |
eapply "${WORKDIR}/patches" |
| 28 |
eapply_user |
| 29 |
|
| 30 |
@@ -260,6 +263,10 @@ src_configure() { |
| 31 |
export ac_cv_python_compile="$(tc-getCC)" |
| 32 |
fi |
| 33 |
|
| 34 |
+ # Remove when >=dev-libs/libutf8proc-2.5.0 is stable |
| 35 |
+ # https://bugs.gentoo.org/721300 |
| 36 |
+ append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc |
| 37 |
+ |
| 38 |
# allow overriding Python include directory |
| 39 |
ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ |
| 40 |
ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ |
Archives