Blame

Date:
Message:
ensure that we always install static binaries to gotweb's chroot Compile static libexec binaries for gotweb, keeping them separate from the main build. Use the same source files but a separate set of Makefiles. Previously, 'make web-install' installed whichever libexec binaries had already been built, and if those happened to be dynamically linked they failed to run inside the chroot which resulted in "privsep peer process closed pipe" being rendered on the index page.
Actions:
History | Blob | Raw File
 1 2c251c14 2020-01-15 tracey .PATH:${.CURDIR}/../lib

 2 2c251c14 2020-01-15 tracey 

 3 bb5b19e3 2020-01-28 stsp SUBDIR = libexec

 4 2c251c14 2020-01-15 tracey 

 5 2c251c14 2020-01-15 tracey .include "../got-version.mk"

 6 bb5b19e3 2020-01-28 stsp .include "Makefile.inc"

 7 2c251c14 2020-01-15 tracey 

 8 2c251c14 2020-01-15 tracey PROG =		gotweb

 9 2c251c14 2020-01-15 tracey SRCS =		gotweb.c parse.y blame.c commit_graph.c delta.c diff.c \

10 2c251c14 2020-01-15 tracey 		diffreg.c error.c fileindex.c object.c object_cache.c \

11 2c251c14 2020-01-15 tracey 		object_idset.c object_parse.c opentemp.c path.c pack.c \

12 2c251c14 2020-01-15 tracey 		privsep.c reference.c repository.c sha1.c worktree.c \

13 2c251c14 2020-01-15 tracey 		inflate.c buf.c rcsutil.c diff3.c lockfile.c \

14 2c251c14 2020-01-15 tracey 		deflate.c object_create.c delta_cache.c

15 0f97c5ad 2020-01-15 tracey MAN =		${PROG}.conf.5

16 2c251c14 2020-01-15 tracey 

17 03b6a916 2020-01-16 stsp CPPFLAGS +=	-I${.CURDIR}/../include -I${.CURDIR}/../lib -I${.CURDIR} \

18 bb5b19e3 2020-01-28 stsp 		-I${KCGIBASE}/include

19 bb5b19e3 2020-01-28 stsp LDADD +=	-L${KCGIBASE}/lib -lkcgihtml -lkcgi

20 43d8c06e 2020-01-28 stsp LDSTATIC =	${STATIC}

21 2c251c14 2020-01-15 tracey 

22 2c251c14 2020-01-15 tracey .if ${GOT_RELEASE} != "Yes"

23 2c251c14 2020-01-15 tracey NOMAN = Yes

24 2c251c14 2020-01-15 tracey .endif

25 2c251c14 2020-01-15 tracey 

26 2c251c14 2020-01-15 tracey realinstall:

27 2c251c14 2020-01-15 tracey 	if [ ! -d ${CGI_DIR}/. ]; then \

28 2c251c14 2020-01-15 tracey 		${INSTALL} -d -o root -g daemon -m 755 ${CGI_DIR}; \

29 2c251c14 2020-01-15 tracey 	fi

30 f29724dd 2020-01-28 stsp 	if [ ! -d ${PUB_REPOS_DIR}/. ]; then \

31 f29724dd 2020-01-28 stsp 		${INSTALL} -d -o root -g daemon -m 755 ${PUB_REPOS_DIR}; \

32 f29724dd 2020-01-28 stsp 	fi

33 54415d85 2020-01-15 tracey 	${INSTALL} -c -o ${WWWUSR} -g ${WWWGRP} -m 0755 ${PROG} \

34 54415d85 2020-01-15 tracey 	    ${CGI_DIR}/${PROG}

35 2c251c14 2020-01-15 tracey 	if [ ! -d ${TMPL_DIR}/. ]; then \

36 2c251c14 2020-01-15 tracey 		${INSTALL} -d -o root -g daemon -m 755 ${TMPL_DIR}; \

37 2c251c14 2020-01-15 tracey 	fi

38 54415d85 2020-01-15 tracey 	${INSTALL} -c -o ${WWWUSR} -g ${WWWGRP} -m 0755 \

39 d1360688 2020-01-28 stsp 	    ${.CURDIR}/files/cgi-bin/gw_tmpl/* ${TMPL_DIR}

40 2c251c14 2020-01-15 tracey 	if [ ! -d ${HTTPD_DIR}/. ]; then \

41 2c251c14 2020-01-15 tracey 		${INSTALL} -d -o root -g daemon -m 755 ${HTTPD_DIR}; \

42 2c251c14 2020-01-15 tracey 	fi

43 ec46ccd7 2020-01-15 tracey 	if [ ! -d ${TMP_DIR}/. ]; then \

44 54415d85 2020-01-15 tracey 		${INSTALL} -d -o ${WWWUSR} -g ${WWWGRP} -m 755 ${TMP_DIR}; \

45 ec46ccd7 2020-01-15 tracey 	fi

46 2c251c14 2020-01-15 tracey 	if [ ! -d ${PROG_DIR}/. ]; then \

47 2c251c14 2020-01-15 tracey 		${INSTALL} -d -o root -g daemon -m 755 ${PROG_DIR}; \

48 2c251c14 2020-01-15 tracey 	fi

49 d1360688 2020-01-28 stsp 	${INSTALL} -c -o ${WWWUSR} -g ${WWWGRP} -m 0755 \

50 d1360688 2020-01-28 stsp 	    ${.CURDIR}/files/htdocs/${PROG}/* ${PROG_DIR}

51 2c251c14 2020-01-15 tracey 

52 2c251c14 2020-01-15 tracey .include <bsd.prog.mk>