Date: Mon, 27 Jun 2016 09:08:35 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417642 - in head/www/thttpd: . files Message-ID: <201606270908.u5R98ZIr034236@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Jun 27 09:08:35 2016 New Revision: 417642 URL: https://svnweb.freebsd.org/changeset/ports/417642 Log: 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) Modified: head/www/thttpd/Makefile head/www/thttpd/files/patch-cgi-src_Makefile.in Modified: head/www/thttpd/Makefile ============================================================================== --- head/www/thttpd/Makefile Mon Jun 27 09:05:20 2016 (r417641) +++ head/www/thttpd/Makefile Mon Jun 27 09:08:35 2016 (r417642) @@ -11,7 +11,7 @@ COMMENT= Tiny/turbo/throttling HTTP serv 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.sampl SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} CPE_VENDOR= acme -MAKE_JOBS_UNSAFE= yes - OPTIONS_DEFINE= SENDFILE IPREAL INDEXES HTACCESS OPTIONS_DEFAULT= SENDFILE IPREAL Modified: head/www/thttpd/files/patch-cgi-src_Makefile.in ============================================================================== --- head/www/thttpd/files/patch-cgi-src_Makefile.in Mon Jun 27 09:05:20 2016 (r417641) +++ head/www/thttpd/files/patch-cgi-src_Makefile.in Mon Jun 27 09:08:35 2016 (r417642) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606270908.u5R98ZIr034236>