From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CE881382C5 for ; Sun, 27 Dec 2020 18:39:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1B462BC1E9; Sun, 27 Dec 2020 18:39:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D5352BC1E9 for ; Sun, 27 Dec 2020 18:39:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 107CA34159D for ; Sun, 27 Dec 2020 18:39:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2647A481 for ; Sun, 27 Dec 2020 18:39:16 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1609094350.62491256deeecf5202c907f826293a2cd8ad949b.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch app-i18n/opencc/opencc-9999.ebuild X-VCS-Directories: app-i18n/opencc/files/ app-i18n/opencc/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 62491256deeecf5202c907f826293a2cd8ad949b X-VCS-Branch: master Date: Sun, 27 Dec 2020 18:39:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 02b7c2b0-64af-462a-8ca8-84bf9ffaba24 X-Archives-Hash: c800cc76a901cd4b2274ab30bf0e871c commit: 62491256deeecf5202c907f826293a2cd8ad949b Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Dec 26 00:00:00 2020 +0000 Commit: Mike Gilbert gentoo 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 Apache.Org> Signed-off-by: Mike Gilbert 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 "$" "$" ++) ++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 "$" "$" +- 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)