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 D4FD9138335 for ; Fri, 19 Jul 2019 15:47:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB9B2E07F9; Fri, 19 Jul 2019 15:47:22 +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 A906AE07F9 for ; Fri, 19 Jul 2019 15:47:22 +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 6DACA3480C5 for ; Fri, 19 Jul 2019 15:47:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE6506F2 for ; Fri, 19 Jul 2019 15:47:18 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1563551230.e4ba8f5a8fa699b615f406bd7f4b4f5ef7a736a2.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/conf2struct/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild dev-util/conf2struct/conf2struct-9999.ebuild X-VCS-Directories: dev-util/conf2struct/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: e4ba8f5a8fa699b615f406bd7f4b4f5ef7a736a2 X-VCS-Branch: master Date: Fri, 19 Jul 2019 15:47:18 +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: 83891281-12a8-47e9-ac9f-3c9a712d1fd7 X-Archives-Hash: 25a8bf2b4bddc02ccc1594135159ed69 commit: e4ba8f5a8fa699b615f406bd7f4b4f5ef7a736a2 Author: Craig Andrews gentoo org> AuthorDate: Fri Jul 19 15:46:08 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Fri Jul 19 15:47:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ba8f5a dev-util/conf2struct: Respect CFLAGS and CC Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Craig Andrews gentoo.org> ...2struct-9999.ebuild => conf2struct-0_pre0-r1.ebuild} | 17 ++++++++++++++++- dev-util/conf2struct/conf2struct-9999.ebuild | 4 ++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild similarity index 50% copy from dev-util/conf2struct/conf2struct-9999.ebuild copy to dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild index f20edc27e4d..b31468b61cc 100644 --- a/dev-util/conf2struct/conf2struct-9999.ebuild +++ b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild @@ -12,9 +12,19 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else KEYWORDS="~amd64" - SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz" + GIT_COMMIT="10ea3356b65e712fb000f4d37f00e1dc09c1e722" + SRC_URI="https://github.com/yrutschle/conf2struct/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${GIT_COMMIT}" fi +PATCHES=( + "${FILESDIR}/${P}-install-and-uninstall.patch" + "${FILESDIR}/${P}-cc-and-cflags.patch" + "${FILESDIR}/${P}-destdir.patch" + "${FILESDIR}/${P}-install-not-run-all.patch" + "${FILESDIR}/${P}-dest-exists.patch" +) + LICENSE="BSD-2" SLOT="0" IUSE="" @@ -23,6 +33,11 @@ RDEPEND="dev-libs/libconfig dev-perl/Conf-Libconfig" DEPEND="${RDEPEND}" +src_compile(){ + # -j1 due to parallel make issue reported upstream at: https://github.com/yrutschle/conf2struct/issues/10 + emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + src_install(){ emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install } diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-9999.ebuild index f20edc27e4d..b853d93f1b8 100644 --- a/dev-util/conf2struct/conf2struct-9999.ebuild +++ b/dev-util/conf2struct/conf2struct-9999.ebuild @@ -23,6 +23,10 @@ RDEPEND="dev-libs/libconfig dev-perl/Conf-Libconfig" DEPEND="${RDEPEND}" +src_compile(){ + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + src_install(){ emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install }