| 1 |
commit: 6a58b258d4077ae3f17fd08b7f867f8e308b6ada |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 15 03:47:48 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 15 03:48:05 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a58b258 |
| 7 |
|
| 8 |
net-misc/sslh: fix parallel build failure w/version.h usage |
| 9 |
|
| 10 |
net-misc/sslh/files/sslh-1.17-version-deps.patch | 13 +++++++++++++ |
| 11 |
net-misc/sslh/sslh-1.17.ebuild | 6 +++++- |
| 12 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/net-misc/sslh/files/sslh-1.17-version-deps.patch b/net-misc/sslh/files/sslh-1.17-version-deps.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..c05b87a |
| 17 |
--- /dev/null |
| 18 |
+++ b/net-misc/sslh/files/sslh-1.17-version-deps.patch |
| 19 |
@@ -0,0 +1,13 @@ |
| 20 |
+make sure the files using version.h depend on it being generated first |
| 21 |
+ |
| 22 |
+--- a/Makefile |
| 23 |
++++ b/Makefile |
| 24 |
+@@ -39,7 +39,7 @@ |
| 25 |
+ |
| 26 |
+ all: sslh $(MAN) echosrv |
| 27 |
+ |
| 28 |
+-.c.o: *.h |
| 29 |
++.c.o: *.h version.h |
| 30 |
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< |
| 31 |
+ |
| 32 |
+ version.h: |
| 33 |
|
| 34 |
diff --git a/net-misc/sslh/sslh-1.17.ebuild b/net-misc/sslh/sslh-1.17.ebuild |
| 35 |
index b6a3380..8f458c2 100644 |
| 36 |
--- a/net-misc/sslh/sslh-1.17.ebuild |
| 37 |
+++ b/net-misc/sslh/sslh-1.17.ebuild |
| 38 |
@@ -5,7 +5,7 @@ |
| 39 |
EAPI=5 |
| 40 |
|
| 41 |
MY_P="${PN}-v${PV}" |
| 42 |
-inherit toolchain-funcs |
| 43 |
+inherit toolchain-funcs eutils |
| 44 |
|
| 45 |
DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" |
| 46 |
HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml" |
| 47 |
@@ -25,6 +25,10 @@ RESTRICT="test" |
| 48 |
|
| 49 |
S=${WORKDIR}/${MY_P} |
| 50 |
|
| 51 |
+src_prepare() { |
| 52 |
+ epatch "${FILESDIR}"/${P}-version-deps.patch |
| 53 |
+} |
| 54 |
+ |
| 55 |
src_compile() { |
| 56 |
emake \ |
| 57 |
CC="$(tc-getCC)" \ |
Archives