diff options
| author | danfe <danfe@FreeBSD.org> | 2016-06-27 17:08:35 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2016-06-27 17:08:35 +0800 |
| commit | 3a9e775516786ae306ea8980d664bc046bd44b67 (patch) | |
| tree | 36f21549e1a4874cf263078e00059b79616b7489 | |
| parent | 606747679cf91a87dd2983f76446e0208f80bcec (diff) | |
| download | freebsd-ports-gnome-3a9e775516786ae306ea8980d664bc046bd44b67.tar.gz freebsd-ports-gnome-3a9e775516786ae306ea8980d664bc046bd44b67.tar.zst freebsd-ports-gnome-3a9e775516786ae306ea8980d664bc046bd44b67.zip | |
Another attempt to make `www/thttpd' multiple make(1) jobs (-jX) safe.
During the build process there is one case when parts (source files) are
located in different directories and then linked together. Dependencies
are specified seemingly correctly, but the problem is that the build rule
`$(CC) $(CFLAGS) -c $*.c' loses information about source file path due to
how `$*' is expanded ("no suffix or preceding directory components") and
does not specify output object path.
Change it to more robust and correct `$(CC) $(CFLAGS) -o $@ -c $<' as a
remedy. Since this is BSD syntax, remove `gmake' from USES.
Tested by: marino (looks good, but not a complete guarantee)
| -rw-r--r-- | www/thttpd/Makefile | 4 | ||||
| -rw-r--r-- | www/thttpd/files/patch-cgi-src_Makefile.in | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 22c9abf5a6ca..119e8f112947 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -11,7 +11,7 @@ COMMENT= Tiny/turbo/throttling HTTP server with CGI support LICENSE= BSD2CLAUSE -USES= cpe gmake # parallel builds (-jX) are broken with BSD make(1) +USES= cpe GNU_CONFIGURE= yes MAKE_ARGS= WEBDIR=${WWWDIR} USE_RC_SUBR= ${PORTNAME} @@ -19,8 +19,6 @@ SUB_FILES= pkg-message thttpd.conf.sample SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} CPE_VENDOR= acme -MAKE_JOBS_UNSAFE= yes - OPTIONS_DEFINE= SENDFILE IPREAL INDEXES HTACCESS OPTIONS_DEFAULT= SENDFILE IPREAL diff --git a/www/thttpd/files/patch-cgi-src_Makefile.in b/www/thttpd/files/patch-cgi-src_Makefile.in index e27a0d19f22e..34d9d08f0c2a 100644 --- a/www/thttpd/files/patch-cgi-src_Makefile.in +++ b/www/thttpd/files/patch-cgi-src_Makefile.in @@ -9,6 +9,15 @@ DEFS = @DEFS@ INCLS = -I.. CFLAGS = $(CCOPT) $(DEFS) $(INCLS) +@@ -46,7 +46,7 @@ + + .c.o: + @rm -f $@ +- $(CC) $(CFLAGS) -c $*.c ++ $(CC) $(CFLAGS) -o $@ -c $< + + all: redirect ssi phf + @@ -67,17 +67,17 @@ cd .. ; $(MAKE) $(MFLAGS) strerror.o |