diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-09-23 02:30:45 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-09-23 02:31:15 +1000 |
| commit | 430ffc3b9d61a40ff807dfd534f4333aeae8198c (patch) | |
| tree | ca044b19f1fffcfc18b5978c05ef86f2e340dea2 | |
| parent | media-libs/mesa-12.0.1-r0: add alpha keyword (diff) | |
| download | gentoo-430ffc3b9d61a40ff807dfd534f4333aeae8198c.tar.gz gentoo-430ffc3b9d61a40ff807dfd534f4333aeae8198c.tar.bz2 gentoo-430ffc3b9d61a40ff807dfd534f4333aeae8198c.zip | |
net-misc/sslh: new patch to solve Makefile dependencies issue
Gentoo-bug: 594586
Package-Manager: portage-2.3.1
| -rw-r--r-- | net-misc/sslh/files/sslh-1.17-version-deps.patch | 13 | ||||
| -rw-r--r-- | net-misc/sslh/files/sslh-1.18-version-deps.patch | 18 | ||||
| -rw-r--r-- | net-misc/sslh/sslh-1.18-r1.ebuild | 1 |
3 files changed, 10 insertions, 22 deletions
diff --git a/net-misc/sslh/files/sslh-1.17-version-deps.patch b/net-misc/sslh/files/sslh-1.17-version-deps.patch deleted file mode 100644 index c05b87ab46ac..000000000000 --- a/net-misc/sslh/files/sslh-1.17-version-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch index aa028715513d..c6108ffb1e9c 100644 --- a/net-misc/sslh/files/sslh-1.18-version-deps.patch +++ b/net-misc/sslh/files/sslh-1.18-version-deps.patch @@ -1,13 +1,15 @@ -make sure the files using version.h depend on it being generated first +Make sure the files using version.h depend on it being generated first. + +Gentoo-bug: 594586 --- a/Makefile +++ b/Makefile -@@ -78,7 +78,7 @@ - systemd-sslh-generator: systemd-sslh-generator.o - $(CC) $(CFLAGS) $(LDFLAGS) -o systemd-sslh-generator systemd-sslh-generator.o -lconfig +@@ -59,7 +59,7 @@ + + all: sslh $(MAN) echosrv --echosrv: $(OBJS) echosrv.o -+echosrv: version.h $(OBJS) echosrv.o - $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o $(LIBS) +-.c.o: *.h ++%.o: %.c *.h version.h + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - $(MAN): sslh.pod Makefile + version.h: diff --git a/net-misc/sslh/sslh-1.18-r1.ebuild b/net-misc/sslh/sslh-1.18-r1.ebuild index 901007083d78..15c62e02d404 100644 --- a/net-misc/sslh/sslh-1.18-r1.ebuild +++ b/net-misc/sslh/sslh-1.18-r1.ebuild @@ -28,7 +28,6 @@ RESTRICT="test" S=${WORKDIR}/${MY_P} PATCHES=( - "${FILESDIR}/${PN}-1.17-version-deps.patch" "${FILESDIR}/${PN}-1.18-version-deps.patch" "${FILESDIR}/${PN}-1.18-systemd-generator.patch" ) |