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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA086158091 for ; Sun, 12 Jun 2022 10:36:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91F14E091F; Sun, 12 Jun 2022 10:36:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76B6EE091F for ; Sun, 12 Jun 2022 10:36:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B961341465 for ; Sun, 12 Jun 2022 10:36:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C47E4FB for ; Sun, 12 Jun 2022 10:36:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1655030185.4a0dcf6b2ab6b2bc5725cc51b813bfa478bee3cf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/openbabel/, sci-chemistry/openbabel/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-chemistry/openbabel/files/openbabel-3.1.1-fix-time-check-cmake.patch sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild X-VCS-Directories: sci-chemistry/openbabel/ sci-chemistry/openbabel/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4a0dcf6b2ab6b2bc5725cc51b813bfa478bee3cf X-VCS-Branch: master Date: Sun, 12 Jun 2022 10:36:35 +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: d8a5883c-c322-471b-956e-ecf1c80189d0 X-Archives-Hash: 1d77a0b8ec5e498b614d0d8f6d2f5cf1 commit: 4a0dcf6b2ab6b2bc5725cc51b813bfa478bee3cf Author: Sam James gentoo org> AuthorDate: Sun Jun 12 10:26:07 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 12 10:36:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0dcf6b sci-chemistry/openbabel: fix build with GCC 12 Closes: https://bugs.gentoo.org/851510 Signed-off-by: Sam James gentoo.org> .../openbabel-3.1.1-fix-time-check-cmake.patch | 32 ++++++++++++++++++++++ .../openbabel/openbabel-3.1.1_p20210225.ebuild | 4 +++ 2 files changed, 36 insertions(+) diff --git a/sci-chemistry/openbabel/files/openbabel-3.1.1-fix-time-check-cmake.patch b/sci-chemistry/openbabel/files/openbabel-3.1.1-fix-time-check-cmake.patch new file mode 100644 index 000000000000..69e41211023b --- /dev/null +++ b/sci-chemistry/openbabel/files/openbabel-3.1.1-fix-time-check-cmake.patch @@ -0,0 +1,32 @@ +https://github.com/openbabel/openbabel/pull/2493 + +From: Sam James +Date: Sun, 12 Jun 2022 11:23:59 +0100 +Subject: [PATCH] CMake: fix time check typo (fixes build failure w/ GCC 12) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without this fixed check, we get a build failure with GCC 12: +``` +/var/tmp/portage/sci-chemistry/openbabel-3.1.1_p20210225/work/openbabel-08e23f39b0cc39b4eebd937a5a2ffc1a7bac3e1b/include/openbabel/obutil.h:65:14: error: ‘clock’ was not declared in this scope; did you mean ‘clock_t’? + 65 | start= clock(); + | ^~~~~ + | clock_t +``` + +Bug: https://bugs.gentoo.org/851510 +--- a/src/config.h.cmake ++++ b/src/config.h.cmake +@@ -182,8 +182,8 @@ + #define OB_MODULE_PATH "@OB_MODULE_PATH@" + + #ifndef TIME_WITH_SYS_TIME +- #ifdef HAVE_SYS_TIME +- #ifdef HAVE_TIME ++ #ifdef HAVE_SYS_TIME_H ++ #ifdef HAVE_TIME_H + #define TIME_WITH_SYS_TIME 1 + #else + #define TIME_WITH_SYS_TIME 0 + diff --git a/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild index 61a6ad498b66..0eb8ddaa0cf5 100644 --- a/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild +++ b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild @@ -80,6 +80,10 @@ RDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/openbabel-3.1.1-fix-time-check-cmake.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp }