commit: 62491256deeecf5202c907f826293a2cd8ad949b Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Sat Dec 26 00:00:00 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Dec 27 18:39:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62491256
app-i18n/opencc: Update patch for parallel build failure. Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../opencc/files/opencc-1.1.0-parallel_build.patch | 40 ++++++++++++++++++++++ app-i18n/opencc/opencc-9999.ebuild | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch b/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch new file mode 100644 index 00000000000..3163aa0a16e --- /dev/null +++ b/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch @@ -0,0 +1,40 @@ +https://github.com/BYVoid/OpenCC/issues/322 + +--- /data/CMakeLists.txt ++++ /data/CMakeLists.txt +@@ -116,6 +116,19 @@ + ) + endforeach(DICT) + ++add_custom_target( ++ copy_libopencc_to_dir_of_opencc_dict ++ COMMENT ++ "Copying libopencc to directory of opencc_dict" ++ COMMAND ++ ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" ++) ++if (WIN32) ++ set(DICT_WIN32_DEPENDS copy_libopencc_to_dir_of_opencc_dict) ++else() ++ set(DICT_WIN32_DEPENDS) ++endif() ++ + foreach(DICT ${DICTS}) + add_custom_command( + OUTPUT +@@ -123,14 +136,13 @@ + COMMENT + "Building ${DICT}.ocd2" + COMMAND +- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" +- COMMAND + ${OPENCC_DICT_BIN} + --input ${DICT_${DICT}_INPUT} + --output ${DICT}.ocd2 + --from text + --to ocd2 + DEPENDS ++ ${DICT_WIN32_DEPENDS} + ${OPENCC_DICT_BIN} + ${DICT_${DICT}_INPUT} + ) diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild index 8a1dbc501c8..6c9c8315e90 100644 --- a/app-i18n/opencc/opencc-9999.ebuild +++ b/app-i18n/opencc/opencc-9999.ebuild @@ -42,7 +42,7 @@ if [[ "${PV}" != "9999" ]]; then fi PATCHES=( - "${FILESDIR}/${PN}-stop-copy.patch" + "${FILESDIR}/${PN}-1.1.0-parallel_build.patch" ) DOCS=(AUTHORS NEWS.md README.md)
