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 1101E138331 for ; Wed, 21 Feb 2018 20:34:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A33FE0984; Wed, 21 Feb 2018 20:34:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 0A4ADE0984 for ; Wed, 21 Feb 2018 20:34:12 +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 40082335C54 for ; Wed, 21 Feb 2018 20:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0DE01F1 for ; Wed, 21 Feb 2018 20:34:08 +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: <1519245137.34f2b3a8006ca31bcc03364066ec7dcd68d2950e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch dev-libs/protobuf/protobuf-3.5.1.1.ebuild X-VCS-Directories: dev-libs/protobuf/files/ dev-libs/protobuf/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 34f2b3a8006ca31bcc03364066ec7dcd68d2950e X-VCS-Branch: master Date: Wed, 21 Feb 2018 20:34:08 +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-Archives-Salt: 11f19061-b52a-4477-ab8f-11f1eba08153 X-Archives-Hash: 154e794cee5080192fbc07ee1a065f18 commit: 34f2b3a8006ca31bcc03364066ec7dcd68d2950e Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Feb 21 17:57:00 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Feb 21 20:32:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f2b3a8 dev-libs/protobuf: Fix building on IA64. Closes: https://bugs.gentoo.org/648248 .../files/protobuf-3.5.0-atomic_operations.patch | 21 +++++++++++++++++++++ dev-libs/protobuf/protobuf-3.5.1.1.ebuild | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch new file mode 100644 index 00000000000..7a88e837950 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch @@ -0,0 +1,21 @@ +https://github.com/google/protobuf/issues/3937 +https://github.com/google/protobuf/pull/3955 +https://github.com/google/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac + +--- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h ++++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h +@@ -146,6 +146,14 @@ + return __atomic_load_n(ptr, __ATOMIC_RELAXED); + } + ++inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, ++ Atomic64 old_value, ++ Atomic64 new_value) { ++ __atomic_compare_exchange_n(ptr, &old_value, new_value, false, ++ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE); ++ return old_value; ++} ++ + #endif // defined(__LP64__) + + } // namespace internal diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild index 4f44ebc4d8c..97cbe92c922 100644 --- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild +++ b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild @@ -23,16 +23,21 @@ PATCHES=( "${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch" "${FILESDIR}/${PN}-3.4.0-system_libraries.patch" "${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch" + "${FILESDIR}/${PN}-3.5.0-atomic_operations.patch" ) DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) src_prepare() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI default eautoreconf } +src_configure() { + append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI + multilib-minimal_src_configure +} + multilib_src_configure() { local myeconfargs=( $(use_enable static-libs static)