| 1 |
commit: 50be00f6ee1ce7eaa585389586a5d838e65e647b |
| 2 |
Author: Naohiro Aota <naota <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 9 17:56:23 2018 +0000 |
| 4 |
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 9 17:57:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50be00f6 |
| 7 |
|
| 8 |
app-i18n/opencc: add patch to avoid conflicting copy |
| 9 |
|
| 10 |
copy command is only necessary in VS build, and it's causing conflict on |
| 11 |
parallel build. Dropping the command is safe on Linux. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/666904 |
| 14 |
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org> |
| 15 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 16 |
|
| 17 |
app-i18n/opencc/files/opencc-stop-copy.patch | 18 ++++++++++++++++++ |
| 18 |
app-i18n/opencc/opencc-1.0.5.ebuild | 7 +++++-- |
| 19 |
app-i18n/opencc/opencc-9999.ebuild | 7 +++++-- |
| 20 |
3 files changed, 28 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..4793951dd25 |
| 25 |
--- /dev/null |
| 26 |
+++ b/app-i18n/opencc/files/opencc-stop-copy.patch |
| 27 |
@@ -0,0 +1,18 @@ |
| 28 |
+We don't need this copy command on Linux (or other than Visual Studio |
| 29 |
+build). Since it is colliding each other on parallel build, drop the |
| 30 |
+command for now. |
| 31 |
+ |
| 32 |
+See https://bugs.gentoo.org/666904 |
| 33 |
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt |
| 34 |
+index 1516775..2deb764 100644 |
| 35 |
+--- a/data/CMakeLists.txt |
| 36 |
++++ b/data/CMakeLists.txt |
| 37 |
+@@ -109,8 +109,6 @@ foreach(DICT ${DICTS}) |
| 38 |
+ ${DICT}.ocd |
| 39 |
+ COMMENT |
| 40 |
+ "Building ${DICT}.ocd" |
| 41 |
+- COMMAND |
| 42 |
+- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" |
| 43 |
+ COMMAND |
| 44 |
+ ${OPENCC_DICT_BIN} |
| 45 |
+ --input ${DICT_${DICT}_INPUT} |
| 46 |
|
| 47 |
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild |
| 48 |
index ba948e2bf80..2ddcaab943f 100644 |
| 49 |
--- a/app-i18n/opencc/opencc-1.0.5.ebuild |
| 50 |
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2017 Gentoo Foundation |
| 53 |
+# Copyright 1999-2018 Gentoo Authors |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI="6" |
| 57 |
@@ -26,7 +26,10 @@ IUSE="doc test" |
| 58 |
DEPEND="doc? ( app-doc/doxygen )" |
| 59 |
|
| 60 |
DOCS="AUTHORS *.md" |
| 61 |
-PATCHES=( "${FILESDIR}"/${PN}-test.patch ) |
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}"/${PN}-test.patch |
| 64 |
+ "${FILESDIR}"/${PN}-stop-copy.patch |
| 65 |
+) |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt |
| 69 |
|
| 70 |
diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild |
| 71 |
index 9ec1cbd5d8b..857d6dd70b8 100644 |
| 72 |
--- a/app-i18n/opencc/opencc-9999.ebuild |
| 73 |
+++ b/app-i18n/opencc/opencc-9999.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 1999-2017 Gentoo Foundation |
| 76 |
+# Copyright 1999-2018 Gentoo Authors |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI="6" |
| 80 |
@@ -26,7 +26,10 @@ IUSE="doc test" |
| 81 |
DEPEND="doc? ( app-doc/doxygen )" |
| 82 |
|
| 83 |
DOCS="AUTHORS *.md" |
| 84 |
-PATCHES=( "${FILESDIR}"/${PN}-test.patch ) |
| 85 |
+PATCHES=( |
| 86 |
+ "${FILESDIR}"/${PN}-test.patch |
| 87 |
+ "${FILESDIR}"/${PN}-stop-copy.patch |
| 88 |
+) |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt |
Archives