public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
Date: Tue, 15 Dec 2015 03:56:16 +0000 (UTC)	[thread overview]
Message-ID: <1450151285.6a58b258d4077ae3f17fd08b7f867f8e308b6ada.vapier@gentoo> (raw)

commit:     6a58b258d4077ae3f17fd08b7f867f8e308b6ada
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:47:48 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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)" \


             reply	other threads:[~2015-12-15  3:56 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-15  3:56 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-07-13 16:59 [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/ Michael Palimaka
2016-09-22 16:31 Michael Palimaka
2018-01-22  1:26 Mike Frysinger
2018-11-17  2:07 Michael Palimaka
2021-08-16  3:40 Craig Andrews
2024-05-17 19:27 Craig Andrews

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1450151285.6a58b258d4077ae3f17fd08b7f867f8e308b6ada.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox