From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9B9311384B4 for ; Tue, 15 Dec 2015 03:56:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F1FE21C014; Tue, 15 Dec 2015 03:56:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85F3421C013 for ; Tue, 15 Dec 2015 03:56:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55D1E34016B for ; Tue, 15 Dec 2015 03:56:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8479A3F for ; Tue, 15 Dec 2015 03:56:16 +0000 (UTC) From: "Mike Frysinger" 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 Frysinger" Message-ID: <1450151285.6a58b258d4077ae3f17fd08b7f867f8e308b6ada.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/sslh/files/sslh-1.17-version-deps.patch net-misc/sslh/sslh-1.17.ebuild X-VCS-Directories: net-misc/sslh/ net-misc/sslh/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 6a58b258d4077ae3f17fd08b7f867f8e308b6ada X-VCS-Branch: master Date: Tue, 15 Dec 2015 03:56:16 +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: 0c595527-6717-4845-a04f-d2e3b2ea0611 X-Archives-Hash: 9ed66162cd8c78e50238fb7175ed8a91 commit: 6a58b258d4077ae3f17fd08b7f867f8e308b6ada Author: Mike Frysinger gentoo org> AuthorDate: Tue Dec 15 03:47:48 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Dec 15 03:48:05 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a58b258 net-misc/sslh: fix parallel build failure w/version.h usage net-misc/sslh/files/sslh-1.17-version-deps.patch | 13 +++++++++++++ net-misc/sslh/sslh-1.17.ebuild | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net-misc/sslh/files/sslh-1.17-version-deps.patch b/net-misc/sslh/files/sslh-1.17-version-deps.patch new file mode 100644 index 0000000..c05b87a --- /dev/null +++ b/net-misc/sslh/files/sslh-1.17-version-deps.patch @@ -0,0 +1,13 @@ +make sure the files using version.h depend on it being generated first + +--- a/Makefile ++++ b/Makefile +@@ -39,7 +39,7 @@ + + all: sslh $(MAN) echosrv + +-.c.o: *.h ++.c.o: *.h version.h + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + + version.h: diff --git a/net-misc/sslh/sslh-1.17.ebuild b/net-misc/sslh/sslh-1.17.ebuild index b6a3380..8f458c2 100644 --- a/net-misc/sslh/sslh-1.17.ebuild +++ b/net-misc/sslh/sslh-1.17.ebuild @@ -5,7 +5,7 @@ EAPI=5 MY_P="${PN}-v${PV}" -inherit toolchain-funcs +inherit toolchain-funcs eutils DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml" @@ -25,6 +25,10 @@ RESTRICT="test" S=${WORKDIR}/${MY_P} +src_prepare() { + epatch "${FILESDIR}"/${P}-version-deps.patch +} + src_compile() { emake \ CC="$(tc-getCC)" \