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 9139F1382C5 for ; Tue, 20 Feb 2018 22:09:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC3E9E095C; Tue, 20 Feb 2018 22:09:28 +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 86784E095C for ; Tue, 20 Feb 2018 22:09:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 083A0335C05 for ; Tue, 20 Feb 2018 22:09:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 576511DF for ; Tue, 20 Feb 2018 22:09:25 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1519164561.c668bef6158b10c416b42b9828b1ab918187b25d.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/zmqpp/, net-libs/zmqpp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch net-libs/zmqpp/zmqpp-4.2.0.ebuild X-VCS-Directories: net-libs/zmqpp/files/ net-libs/zmqpp/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: c668bef6158b10c416b42b9828b1ab918187b25d X-VCS-Branch: master Date: Tue, 20 Feb 2018 22:09:25 +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: b5bdde9a-05f8-4595-9d9c-ae7840fde044 X-Archives-Hash: 34a7a0733e3739f8582ad47b02108bde commit: c668bef6158b10c416b42b9828b1ab918187b25d Author: Mathy Vanvoorden vanvoorden be> AuthorDate: Fri Dec 1 09:19:14 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Tue Feb 20 22:09:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c668bef6 net-libs/zmqpp: fix multilib-strict check failure. Closes: https://github.com/gentoo/gentoo/pull/6368 Package-Manager: Portage-2.3.14, Repoman-2.3.6 net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch | 15 +++++++++++++++ net-libs/zmqpp/zmqpp-4.2.0.ebuild | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch new file mode 100644 index 00000000000..798c028396c --- /dev/null +++ b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 489916a..e6ca7d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,8 +231,8 @@ endif() + # ------- + install(TARGETS ${INSTALL_TARGET_LIST} + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(DIRECTORY src/zmqpp DESTINATION include/ + FILES_MATCHING PATTERN "*.hpp") diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0.ebuild index e60bfa0f62c..4eb86e192ea 100644 --- a/net-libs/zmqpp/zmqpp-4.2.0.ebuild +++ b/net-libs/zmqpp/zmqpp-4.2.0.ebuild @@ -23,6 +23,10 @@ IUSE="static-libs" DEPEND="net-libs/zeromq[static-libs?]" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-multilib-strict.patch" +) + src_configure() { local mycmakeargs=( -DIS_TRAVIS_CI_BUILD=OFF