[gentoo-commits] repo/gentoo:master commit in: dev-util/conf2struct/

[Craig Andrews]

commit:     e4ba8f5a8fa699b615f406bd7f4b4f5ef7a736a2
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 15:46:08 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> 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 <candrews <AT> 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
 }