diff options
| author | Russell Senior <russell@personaltelco.net> | 2014-06-17 14:12:38 -0700 |
|---|---|---|
| committer | Russell Senior <russell@personaltelco.net> | 2014-06-17 14:20:02 -0700 |
| commit | 706b463115ae5b92b6469cf5ee26e8917d7a36c4 (patch) | |
| tree | 366fefbe03e0415787790e3168553b2c1b15473f /net/sslh/patches | |
| parent | ee15782a9fde127575984ded73e7e07c7df2cdfc (diff) | |
sslh: fix build by correcting version and refreshing makefile patch
Signed-off-by: Russell Senior <russell@personaltelco.net>
Diffstat (limited to 'net/sslh/patches')
| -rw-r--r-- | net/sslh/patches/001-no_sslh_select.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/net/sslh/patches/001-no_sslh_select.patch b/net/sslh/patches/001-no_sslh_select.patch index 71530269e..2ff68116f 100644 --- a/net/sslh/patches/001-no_sslh_select.patch +++ b/net/sslh/patches/001-no_sslh_select.patch @@ -1,29 +1,29 @@ --- a/Makefile +++ b/Makefile -@@ -37,16 +37,12 @@ all: sslh $(MAN) echosrv - $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -c $< +@@ -45,16 +45,12 @@ all: sslh $(MAN) echosrv + version.h: + ./genver.sh >version.h +-sslh: sslh-fork sslh-select ++sslh: sslh-fork --sslh: $(OBJS) sslh-fork sslh-select -+sslh: $(OBJS) sslh-fork - - sslh-fork: $(OBJS) sslh-fork.o Makefile common.h - $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) + sslh-fork: version.h $(OBJS) sslh-fork.o Makefile common.h + $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) #strip sslh-fork --sslh-select: $(OBJS) sslh-select.o Makefile common.h -- $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-select sslh-select.o $(OBJS) $(LIBS) +-sslh-select: version.h $(OBJS) sslh-select.o Makefile common.h +- $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-select sslh-select.o $(OBJS) $(LIBS) - #strip sslh-select - echosrv: $(OBJS) echosrv.o - $(CC) $(CFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS) -@@ -77,7 +73,7 @@ uninstall: - update-rc.d sslh remove +@@ -86,7 +82,7 @@ distclean: clean + rm -f tags cscope.* clean: -- rm -f sslh-fork sslh-select echosrv $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info -+ rm -f sslh-fork echosrv $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info +- rm -f sslh-fork sslh-select echosrv version.h $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info ++ rm -f sslh-fork echosrv version.h $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info tags: ctags --globals -T *.[ch] |