BSDBuild

Author: vedge Date: 2015-07-14 02:46:19 -0400 (Tue, 14 Jul 2015) New Revision: 1043 Modified: trunk/mkconfigure.pl Log: remove redundant -x tests from path traversal. Modified: trunk/mkconfigure.pl ... [More] =================================================================== --- trunk/mkconfigure.pl2015-07-14 06:45:45 UTC (rev 1042) +++ trunk/mkconfigure.pl2015-07-14 06:46:19 UTC (rev 1043) < at >< at > -1089,11 +1089,9 < at >< at > print << 'EOF'; PERL="" for path in `echo $PATH | sed 's/:/ /g'`; do -if [ -x "${path}" ]; then -if [ -e "${path}/perl" ]; then -PERL="${path}/perl" -break -fi +if [ -x "${path}/perl" ]; then +PERL="${path}/perl" +break fi done EOF < at >< at > -1104,11 +1102,9 < at >< at > print << 'EOF'; PKGCONFIG="" for path in `echo $PATH | sed 's/:/ /g'`; do -if [ -x "${path}" ]; then -if [ -e "${path}/pkg-config" ]; then -PKGCONFIG="${path}/pkg-config" -break -fi +if [ -x "${path}/pkg-config" ]; then +PKGCONFIG="${path}/pkg-config" +break fi done EOF [Less]

Author: vedge Date: 2015-07-14 02:45:18 -0400 (Tue, 14 Jul 2015) New Revision: 1040 Modified: trunk/BSDBuild/Builtins.pm trunk/Makefile trunk/build.man.mk trunk/configure Log: <build.man.mk>: add support for new OpenBSD mandoc(1). ... [More] add "lint" target. Modified: trunk/BSDBuild/Builtins.pm =================================================================== --- trunk/BSDBuild/Builtins.pm2015-07-14 06:19:51 UTC (rev 1039) +++ trunk/BSDBuild/Builtins.pm2015-07-14 06:45:18 UTC (rev 1040) < at >< at > -1,6 +1,6 < at >< at > # vim:ts=4 # -# Copyright (c) 2010 Hypertriton, Inc. <http://hypertriton.com/> +# Copyright (c) 2010-2015 Hypertriton, Inc. <http://hypertriton.com/> # All rights reserved. # # Redistribution and use in source and binary forms, with or without < at >< at > -29,24 +29,47 < at >< at > sub BuiltinDoc { print << 'EOF'; +cat << EOT > conftest.1 +.\" COMMENT +.Dd +.Dd NOVEMBER 23, 2009 +.Dt TEST 1 +.Os +.ds vT Test +.ds oS Test 1.0 +.Sh NAME +.Nm test +.Nd Test document +.Sh DESCRIPTION +EOT + HAVE_MANDOC="no" -NROFF="" +MANDOC="" for path in `echo $PATH | sed 's/:/ /g'`; do -if [ -x "${path}/nroff" ]; then -NROFF="${path}/nroff" +if [ -x "${path}/mandoc" ]; then +cat conftest.1 | ${path}/mandoc -Tascii >/dev/null +if [ "$?" = "0" ]; then +HAVE_MANDOC="yes" +MANDOC="${path}/mandoc" +break; +fi +elif [ -x "${path}/nroff" ]; then +cat conftest.1 | ${path}/nroff -Tmandoc >/dev/null +if [ "$?" = "0" ]; then +HAVE_MANDOC="yes" +MANDOC="${path}/nroff -Tmandoc" +break; +fi fi done -if [ "${NROFF}" != "" ]; then -echo | ${NROFF} -Tmandoc >/dev/null -if [ "$?" = "0" ]; then -HAVE_MANDOC="yes" -fi -fi +rm -f conftest.1 + if [ "${HAVE_MANDOC}" = "no" ]; then if [ "${with_manpages}" = "yes" ]; then echo "*" -echo "* --with-manpages was requested, but either the nroff(1)" -echo "* utility or the mdoc(7) macro package was not found." +echo "* --with-manpages was requested, but either the" +echo "* nroff(1)/mandoc(1) utility or the mdoc(7) macro" +echo "* package were not found." echo "*" exit 1 fi < at >< at > -55,6 +78,7 < at >< at > echo "NOMANLINKS=yes" >> Makefile.config else echo "HAVE_MANDOC=yes" >> Makefile.config +echo "MANDOC=${MANDOC}" >> Makefile.config if [ "${with_catman}" = "no" ]; then echo "NOCATMAN=yes" >> Makefile.config else < at >< at > -98,6 +122,7 < at >< at > for path in `echo $PATH | sed 's/:/ /g'`; do if [ -x "${path}/msgfmt" ]; then msgfmt=${path}/msgfmt +break fi done if [ "${msgfmt}" != "" ]; then < at >< at > -124,6 +149,7 < at >< at > for path in `echo $PATH | sed 's/:/ /g'`; do if [ -x "${path}/ectags" ]; then CTAGS="${path}/ectags" +break fi done if [ "${CTAGS}" = "" ]; then < at >< at > -130,6 +156,7 < at >< at > for path in `echo $PATH | sed 's/:/ /g'`; do if [ -x "${path}/ctags" ]; then CTAGS="${path}/ctags" +break fi done fi Modified: trunk/Makefile =================================================================== --- trunk/Makefile2015-07-14 06:19:51 UTC (rev 1039) +++ trunk/Makefile2015-07-14 06:45:18 UTC (rev 1040) < at >< at > -109,7 +109,6 < at >< at > chmod 755 configure depend: -# nothing release: env VERSION=`perl get-version.pl` RELEASE="`perl get-release.pl`" \ Modified: trunk/build.man.mk =================================================================== --- trunk/build.man.mk2015-07-14 06:19:51 UTC (rev 1039) +++ trunk/build.man.mk2015-07-14 06:45:18 UTC (rev 1040) < at >< at > -1,5 +1,5 < at >< at > # -# Copyright (c) 2001-2011 Hypertriton, Inc. <http://hypertriton.com/> +# Copyright (c) 2001-2015 Hypertriton, Inc. <http://hypertriton.com/> # All rights reserved. # # Redistribution and use in source and binary forms, with or without < at >< at > -23,29 +23,29 < at >< at > # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. # -# Preformat and install manual pages from nroff sources. +# Preformat and install manual pages from mandoc sources. # -NROFF?=nroff +MANDOC?= PAGER?=more -MAN1?="" -MAN2?="" -MAN3?="" -MAN4?="" -MAN5?="" -MAN6?="" -MAN7?="" -MAN8?="" -MAN9?="" -CATMAN1?="" -CATMAN2?="" -CATMAN3?="" -CATMAN4?="" -CATMAN5?="" -CATMAN6?="" -CATMAN7?="" -CATMAN8?="" -CATMAN9?="" +MAN1?= +MAN2?= +MAN3?= +MAN4?= +MAN5?= +MAN6?= +MAN7?= +MAN8?= +MAN9?= +CATMAN1?= +CATMAN2?= +CATMAN3?= +CATMAN4?= +CATMAN5?= +CATMAN6?= +CATMAN7?= +CATMAN8?= +CATMAN9?= MANS=${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} ${MAN9} MANLINKS?= NOMAN?= < at >< at > -53,7 +53,7 < at >< at > NOMANLINKS?= CLEANFILES?= -all: all-subdir preformat-man +all: all-subdir all-catman install: install-man-dirs install-man install-subdir deinstall: deinstall-subdir clean: clean-man clean-subdir < at >< at > -61,25 +61,45 < at >< at > regress: regress-subdir depend: depend-subdir -.SUFFIXES: .1 .2 .3 .4 .5 .6 .7 .8 .9 .cat1 .cat2 .cat3 .cat4 .cat5 .cat6 .cat7 .cat8 .cat9 .ps1 .ps2 .ps3 .ps4 .ps5 .ps6 .ps7 .ps8 .ps9 +.SUFFIXES: .1 .2 .3 .4 .5 .6 .7 .8 .9 .cat1 .cat2 .cat3 .cat4 .cat5 .cat6 .cat7 .cat8 .cat9 .ps .pdf .html .1.cat1 .2.cat2 .3.cat3 .4.cat4 .5.cat5 .6.cat6 .7.cat7 .8.cat8 .9.cat9: -< at >echo "${NROFF} -Tascii -mandoc $< > $< at >" +< at >echo "${MANDOC} -Tascii $< > $< at >" < at >(cat $< | \ sed 's,\$$SYSCONFDIR,${SYSCONFDIR},' | \ sed 's,\$$PREFIX,${PREFIX},' | \ sed 's,\$$DATADIR,${DATADIR},' | \ - ${NROFF} -Tascii -mandoc > $< at >) || (rm -f $< at >; true) + ${MANDOC} -Tascii > $< at >) || (rm -f $< at >; true) -.1.ps1 .2.ps2 .3.ps3 .4.ps4 .5.ps5 .6.ps6 .7.ps7 .8.ps8 .9.ps9: -< at >echo "${NROFF} -Tps -mandoc $< > $< at >" +.1.ps .2.ps .3.ps .4.ps .5.ps .6.ps .7.ps .8.ps .9.ps: +< at >if [ "${HAVE_MANDOC}" != "yes" ]; then echo "Requires mandoc"; exit 1; fi +< at >echo "${MANDOC} -Tps $< > $< at >" < at >(cat $< | \ sed 's,\$$SYSCONFDIR,${SYSCONFDIR},' | \ sed 's,\$$PREFIX,${PREFIX},' | \ sed 's,\$$DATADIR,${DATADIR},' | \ - ${NROFF} -Tps -mandoc > $< at >) || (rm -f $< at >; true) + ${MANDOC} -Tps > $< at >) || (rm -f $< at >; true) -preformat-man: +.1.pdf .2.pdf .3.pdf .4.pdf .5.pdf .6.pdf .7.pdf .8.pdf .9.pdf: +< at >if [ "${HAVE_MANDOC}" != "yes" ]; then echo "Requires mandoc"; exit 1; fi +< at >echo "${MANDOC} -Tpdf $< > $< at >" +< at >(cat $< | \ + sed 's,\$$SYSCONFDIR,${SYSCONFDIR},' | \ + sed 's,\$$PREFIX,${PREFIX},' | \ + sed 's,\$$DATADIR,${DATADIR},' | \ + ${MANDOC} -Tpdf > $< at >) || (rm -f $< at >; true) + +.1.html .2.html .3.html .4.html .5.html .6.html .7.html .8.html .9.html: +< at >if [ "${HAVE_MANDOC}" != "yes" ]; then echo "Requires mandoc"; exit 1; fi +< at >echo "${MANDOC} -Thtml $< > $< at >" +< at >(cat $< | \ + sed 's,\$$SYSCONFDIR,${SYSCONFDIR},' | \ + sed 's,\$$PREFIX,${PREFIX},' | \ + sed 's,\$$DATADIR,${DATADIR},' | \ + ${MANDOC} -Thtml > $< at >) || (rm -f $< at >; true) + +all-catman: +< at >if [ "${HAVE_MANDOC}" != "yes" ]; then exit 0; fi < at >if [ "${MAN1}" != "" -a "${NOMAN}" != "yes" ]; then \ if [ "${CATMAN1}" = "" ]; then \ CATLIST=""; \ < at >< at > -492,8 +512,8 < at >< at > man: < at >if [ "${MAN}" != "" ]; then \ -echo "${NROFF} -Tascii -mandoc ${MAN} | ${PAGER}"; \ -${NROFF} -Tascii -mandoc ${MAN} | ${PAGER}; \ +echo "${MANDOC} -Tascii ${MAN} | ${PAGER}"; \ +${MANDOC} -Tascii ${MAN} | ${PAGER}; \ else \ echo "Usage: ${MAKE} man MAN=(manpage)"; \ exit 1; \ < at >< at > -590,8 +610,23 < at >< at > done; \ fi +lint: +< at >if [ "${HAVE_MANDOC}" != "yes" ]; then \ +echo "Cannot find mandoc (re-run ./configure?)"; \ +exit 1; \ +fi +< at >if [ "${MAN1}" != "" ]; then for F in ${MAN1}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN2}" != "" ]; then for F in ${MAN2}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN3}" != "" ]; then for F in ${MAN3}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN4}" != "" ]; then for F in ${MAN4}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN5}" != "" ]; then for F in ${MAN5}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN6}" != "" ]; then for F in ${MAN6}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN7}" != "" ]; then for F in ${MAN7}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN8}" != "" ]; then for F in ${MAN8}; do ${MANDOC} -Tlint $$F; done; fi +< at >if [ "${MAN9}" != "" ]; then for F in ${MAN9}; do ${MANDOC} -Tlint $$F; done; fi + .PHONY: install deinstall clean cleandir regress depend -.PHONY: install-man install-manlinks clean-man -.PHONY: man preformat-man install-man-dirs manlinks all-manlinks man2wiki +.PHONY: install-man install-manlinks clean-man +.PHONY: man all-catman install-man-dirs manlinks all-manlinks man2wiki include ${TOP}/mk/build.common.mk Modified: trunk/configure =================================================================== --- trunk/configure2015-07-14 06:19:51 UTC (rev 1039) +++ trunk/configure2015-07-14 06:45:18 UTC (rev 1040) < at >< at > -1,7 +1,7 < at >< at > #!/bin/sh # # Do not edit! -# This file was generated from configure.in by BSDBuild 3.0. +# This file was generated from configure.in by BSDBuild 3.1. # # To regenerate this file, get the latest BSDBuild release from # http://hypertriton.com/bsdbuild/, and use the command: < at >< at > -175,20 +175,16 < at >< at > fi PERL="" for path in `echo $PATH | sed 's/:/ /g'`; do -if [ -x "${path}" ]; then -if [ -e "${path}/perl" ]; then -PERL="${path}/perl" -break -fi +if [ -x "${path}/perl" ]; then +PERL="${path}/perl" +break fi done PKGCONFIG="" for path in `echo $PATH | sed 's/:/ /g'`; do -if [ -x "${path}" ]; then -if [ -e "${path}/pkg-config" ]; then -PKGCONFIG="${path}/pkg-config" -break -fi +if [ -x "${path}/pkg-config" ]; then +PKGCONFIG="${path}/pkg-config" +break fi done if [ "${prefix}" != "" ]; then < at >< at > -350,7 +346,7 < at >< at > fi fi if [ "${show_help}" = "yes" ]; then -echo "This configure script was generated by BSDBuild 3.0." +echo "This configure script was generated by BSDBuild 3.1." echo "<http://bsdbuild.hypertriton.com/>" echo "" echo "Usage: ./configure [options]" < at >< at > -386,7 +382,7 < at >< at > exit 1 fi; if [ "${show_version}" = "yes" ]; then -echo "BSDBuild 3.0" +echo "BSDBuild 3.1" exit 0 fi; if [ "${srcdir}" != "" ]; then < at >< at > -413,16 +409,16 < at >< at > else CROSS_COMPILING="no" fi -echo "BSDBuild 3.0 (http://bsdbuild.hypertriton.com)" +echo "BSDBuild 3.1 (http://bsdbuild.hypertriton.com)" echo "#!/bin/sh" > config.status -echo "# Generated by configure script (BSDBuild 3.0)." >> config.status -echo "Generated by configure script (BSDBuild 3.0)." > config.log +echo "# Generated by configure script (BSDBuild 3.1)." >> config.status +echo "Generated by configure script (BSDBuild 3.1)." > config.log if [ -e "Makefile.config" ]; then echo "* Overwriting existing Makefile.config" fi -echo "# Generated by configure script (BSDBuild 3.0)." > Makefile.config +echo "# Generated by configure script (BSDBuild 3.1)." > Makefile.config echo "" >> Makefile.config echo "BUILD=${build}" >> Makefile.config echo "HOST=${host}" >> Makefile.config < at >< at > -449,24 +445,47 < at >< at > echo "Could not create config directory." exit 1 fi +cat << EOT > conftest.1 +.\" COMMENT +.Dd +.Dd NOVEMBER 23, 2009 +.Dt TEST 1 +.Os +.ds vT Test +.ds oS Test 1.0 +.Sh NAME +.Nm test +.Nd Test document +.Sh DESCRIPTION +EOT + HAVE_MANDOC="no" -NROFF="" +MANDOC="" for path in `echo $PATH | sed 's/:/ /g'`; do -if [ -x "${path}/nroff" ]; then -NROFF="${path}/nroff" +if [ -x "${path}/mandoc" ]; then +cat conftest.1 | ${path}/mandoc -Tascii >/dev/null +if [ "$?" = "0" ]; then +HAVE_MANDOC="yes" +MANDOC="${path}/mandoc" +break; +fi +elif [ -x "${path}/nroff" ]; then +cat conftest.1 | ${path}/nroff -Tmandoc >/dev/null +if [ "$?" = "0" ]; then +HAVE_MANDOC="yes" +MANDOC="${path}/nroff -Tmandoc" +break; +fi fi done -if [ "${NROFF}" != "" ]; then -echo | ${NROFF} -Tmandoc >/dev/null -if [ "$?" = "0" ]; then -HAVE_MANDOC="yes" -fi -fi +rm -f conftest.1 + if [ "${HAVE_MANDOC}" = "no" ]; then if [ "${with_manpages}" = "yes" ]; then echo "*" -echo "* --with-manpages was requested, but either the nroff(1)" -echo "* utility or the mdoc(7) macro package was not found." +echo "* --with-manpages was requested, but either the" +echo "* nroff(1)/mandoc(1) utility or the mdoc(7) macro" +echo "* package were not found." echo "*" exit 1 fi < at >< at > -475,6 +494,7 < at >< at > echo "NOMANLINKS=yes" >> Makefile.config else echo "HAVE_MANDOC=yes" >> Makefile.config +echo "MANDOC=${MANDOC}" >> Makefile.config if [ "${with_catman}" = "no" ]; then echo "NOCATMAN=yes" >> Makefile.config else < at >< at > -513,6 +533,7 < at >< at > for path in `echo $PATH | sed 's/:/ /g'`; do if [ -x "${path}/msgfmt" ]; then msgfmt=${path}/msgfmt +break fi done if [ "${msgfmt}" != "" ]; then < at >< at > -535,6 +556,7 < at >< at > for path in `echo $PATH | sed 's/:/ /g'`; do if [ -x "${path}/ectags" ]; then CTAGS="${path}/ectags" +break fi done if [ "${CTAGS}" = "" ]; then < at >< at > -541,6 +563,7 < at >< at > for path in `echo $PATH | sed 's/:/ /g'`; do if [ -x "${path}/ctags" ]; then CTAGS="${path}/ctags" +break fi done fi < at >< at > -673,36 +696,36 < at >< at > echo "hdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua fi; CONFIGURE_OK="yes" -echo "CONFIGURE_OK=$CONFIGURE_OK" >>Makefile.config -echo "mdefs[\"CONFIGURE_OK\"] = \"$CONFIGURE_OK\"" >>configure.lua -echo "PACKAGE=$PACKAGE" >>Makefile.config -echo "mdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua -echo "LOCALEDIR=$LOCALEDIR" >>Makefile.config -echo "mdefs[\"LOCALEDIR\"] = \"$LOCALEDIR\"" >>configure.lua -echo "LIBEXECDIR=$LIBEXECDIR" >>Makefile.config -echo "mdefs[\"LIBEXECDIR\"] = \"$LIBEXECDIR\"" >>configure.lua echo "LIBDIR=$LIBDIR" >>Makefile.config echo "mdefs[\"LIBDIR\"] = \"$LIBDIR\"" >>configure.lua -echo "RELEASE=$RELEASE" >>Makefile.config -echo "mdefs[\"RELEASE\"] = \"$RELEASE\"" >>configure.lua -echo "HAVE_GETTEXT=$HAVE_GETTEXT" >>Makefile.config -echo "mdefs[\"HAVE_GETTEXT\"] = \"$HAVE_GETTEXT\"" >>configure.lua -echo "ENABLE_NLS=$ENABLE_NLS" >>Makefile.config -echo "mdefs[\"ENABLE_NLS\"] = \"$ENABLE_NLS\"" >>configure.lua +echo "SYSCONFDIR=$SYSCONFDIR" >>Makefile.config +echo "mdefs[\"SYSCONFDIR\"] = \"$SYSCONFDIR\"" >>configure.lua echo "MANDIR=$MANDIR" >>Makefile.config echo "mdefs[\"MANDIR\"] = \"$MANDIR\"" >>configure.lua +echo "STATEDIR=$STATEDIR" >>Makefile.config +echo "mdefs[\"STATEDIR\"] = \"$STATEDIR\"" >>configure.lua +echo "PACKAGE=$PACKAGE" >>Makefile.config +echo "mdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua echo "MODULEDIR=$MODULEDIR" >>Makefile.config echo "mdefs[\"MODULEDIR\"] = \"$MODULEDIR\"" >>configure.lua -echo "DATADIR=$DATADIR" >>Makefile.config -echo "mdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua -echo "SYSCONFDIR=$SYSCONFDIR" >>Makefile.config -echo "mdefs[\"SYSCONFDIR\"] = \"$SYSCONFDIR\"" >>configure.lua -echo "STATEDIR=$STATEDIR" >>Makefile.config -echo "mdefs[\"STATEDIR\"] = \"$STATEDIR\"" >>configure.lua echo "BINDIR=$BINDIR" >>Makefile.config echo "mdefs[\"BINDIR\"] = \"$BINDIR\"" >>configure.lua echo "VERSION=$VERSION" >>Makefile.config echo "mdefs[\"VERSION\"] = \"$VERSION\"" >>configure.lua +echo "CONFIGURE_OK=$CONFIGURE_OK" >>Makefile.config +echo "mdefs[\"CONFIGURE_OK\"] = \"$CONFIGURE_OK\"" >>configure.lua +echo "HAVE_GETTEXT=$HAVE_GETTEXT" >>Makefile.config +echo "mdefs[\"HAVE_GETTEXT\"] = \"$HAVE_GETTEXT\"" >>configure.lua +echo "LOCALEDIR=$LOCALEDIR" >>Makefile.config +echo "mdefs[\"LOCALEDIR\"] = \"$LOCALEDIR\"" >>configure.lua +echo "RELEASE=$RELEASE" >>Makefile.config +echo "mdefs[\"RELEASE\"] = \"$RELEASE\"" >>configure.lua +echo "DATADIR=$DATADIR" >>Makefile.config +echo "mdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua +echo "ENABLE_NLS=$ENABLE_NLS" >>Makefile.config +echo "mdefs[\"ENABLE_NLS\"] = \"$ENABLE_NLS\"" >>configure.lua +echo "LIBEXECDIR=$LIBEXECDIR" >>Makefile.config +echo "mdefs[\"LIBEXECDIR\"] = \"$LIBEXECDIR\"" >>configure.lua if [ "${srcdir}" != "" ]; then $ECHO_N "* Source is in ${srcdir}. Generating Makefiles..." ${PERL} ${SRC}/mk/mkconcurrent.pl ${SRC} [Less]

Author: vedge Date: 2015-07-14 02:19:51 -0400 (Tue, 14 Jul 2015) New Revision: 1039 Modified: trunk/hstrip.pl Log: don't strip empty lines inside of <pre> blocks. Modified: trunk/hstrip.pl ... [More] =================================================================== --- trunk/hstrip.pl2015-05-04 06:28:45 UTC (rev 1038) +++ trunk/hstrip.pl2015-07-14 06:19:51 UTC (rev 1039) < at >< at > -1,10 +1,14 < at >< at > # Public domain +# Strip empty lines from HTML documents (except <pre> contents). # -# hstrip.pl: Strip empty lines. -# +my $inPre = 0; while (<STDIN>) { chop; -if (/^$/) { +if (/<\s*pre[[:print:]]*>/i) { +$inPre = 1; +} +if (/<\s*\/\s*pre\s*>/i) { $inPre = 0; } +if (!$inPre && /^\s*$/) { next; } print $_, "\n"; [Less]

Author: vedge Date: 2015-05-04 02:28:45 -0400 (Mon, 04 May 2015) New Revision: 1038 Modified: trunk/BSDBuild/cc.pm Log: #include <stdio.h>, not <string.h> in long double test Modified: trunk/BSDBuild/cc.pm ... [More] =================================================================== --- trunk/BSDBuild/cc.pm2015-05-04 06:20:49 UTC (rev 1037) +++ trunk/BSDBuild/cc.pm2015-05-04 06:28:45 UTC (rev 1038) < at >< at > -129,7 +129,7 < at >< at > # XXX: should rename to HAVE_CC_LONG_DOUBLE MkPrintN('cc: checking for long double...'); TryCompile('HAVE_LONG_DOUBLE', << 'EOF'); -#include <string.h> +#include <stdio.h> int main(int argc, char *argv[]) { [Less]

Author: vedge Date: 2015-03-01 23:54:56 -0500 (Sun, 01 Mar 2015) New Revision: 1036 Modified: trunk/BSDBuild/x11.pm Log: improve the -lX11 autodetection where the pkg-config "x11" module is missing. Modified: trunk/BSDBuild/x11.pm ... [More] =================================================================== --- trunk/BSDBuild/x11.pm2015-03-02 04:54:07 UTC (rev 1035) +++ trunk/BSDBuild/x11.pm2015-03-02 04:54:56 UTC (rev 1036) < at >< at > -24,6 +24,8 < at >< at > # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. my < at >autoIncludeDirs = ( +'/usr/local/include', +'/usr/include', '/usr/include/X11', '/usr/include/X11R6', '/usr/include/X11R7', < at >< at > -39,6 +41,8 < at >< at > ); my < at >autoLibDirs = ( +'/usr/local/lib', +'/usr/lib', '/usr/local/X11/lib', '/usr/local/X11R6/lib', '/usr/local/X11R7/lib', < at >< at > -63,18 +67,24 < at >< at > MkDefine('X11_CFLAGS', "-I$pfx/include"); MkEndif; MkIfExists("$pfx/lib"); - MkDefine('X11_LIBS', "-L$pfx/lib"); + MkDefine('X11_LIBS', "-L$pfx/lib -lX11"); MkEndif; MkElse; foreach my $dir (< at >autoIncludeDirs) { MkIfExists("$dir/X11"); MkDefine('X11_CFLAGS', "-I$dir"); +MkBreak; MkEndif; } foreach my $dir (< at >autoLibDirs) { -MkIfExists($dir); - MkDefine('X11_LIBS', "\${X11_LIBS} -L$dir"); +MkIfExists("$dir/libX11.so"); + MkDefine('X11_LIBS', "-L$dir -lX11"); +MkBreak; MkEndif; +MkIfExists("$dir/libX11.so.*"); + MkDefine('X11_LIBS', "-L$dir -lX11"); +MkBreak; +MkEndif; } #MkIfNE('${X11_CFLAGS}', ''); #MkPrint("trying autodetected path"); < at >< at > -83,7 +93,7 < at >< at > MkEndif; MkEndif; -MkCompileC('HAVE_X11', '${X11_CFLAGS}', '${X11_LIBS} -lX11', << 'EOF'); +MkCompileC('HAVE_X11', '${X11_CFLAGS}', '${X11_LIBS}', << 'EOF'); #include <X11/Xlib.h> int main(int argc, char *argv[]) { [Less]

Author: vedge Date: 2015-03-01 23:54:07 -0500 (Sun, 01 Mar 2015) New Revision: 1035 Modified: trunk/BSDBuild/Core.pm Log: have MkIfPkgConfig() return true if pkg-config is available, and the specified module available as well Modified: ... [More] trunk/BSDBuild/Core.pm =================================================================== --- trunk/BSDBuild/Core.pm2015-02-19 15:24:19 UTC (rev 1034) +++ trunk/BSDBuild/Core.pm2015-03-02 04:54:07 UTC (rev 1035) < at >< at > -246,7 +246,11 < at >< at > sub MkIfPkgConfig { -print 'if [ "${PKGCONFIG}" != "" ]; then', "\n"; +my ($pkg) = < at >_; + +print << "EOF"; +if [ "\${PKGCONFIG}" != "" -a "`\${PKGCONFIG} --variable=prefix $pkg 2>/dev/null`" != "" ]; then +EOF } # Variant of MkExecOutputPfx() for pkg-config. [Less]

Author: vedge Date: 2015-02-19 10:24:19 -0500 (Thu, 19 Feb 2015) New Revision: 1034 Modified: trunk/BSDBuild/math_c99.pm Log: add special case for *-pc-mingw32, to work around libmingwex link error with single-precision variants of math routines. ... [More] Modified: trunk/BSDBuild/math_c99.pm =================================================================== --- trunk/BSDBuild/math_c99.pm2015-02-19 15:22:00 UTC (rev 1033) +++ trunk/BSDBuild/math_c99.pm2015-02-19 15:24:19 UTC (rev 1034) < at >< at > -34,8 +34,15 < at >< at > MkDefine('MATH_C99_CFLAGS', ''); MkDefine('MATH_C99_LIBS', '-lm'); MkEndif; - -MkCompileC('HAVE_MATH_C99', '${CFLAGS} ${MATH_C99_CFLAGS}', '${MATH_C99_LIBS}', << 'EOF'); + +MkCaseIn('${host}'); +MkCaseBegin('*-pc-mingw32*'); +MkPrint('skipping (libmingwex linker errors)'); +MkDefine('HAVE_MATH_C99', 'no'); +MkSaveUndef('HAVE_MATH_C99'); +MkCaseEnd; +MkCaseBegin('*'); +MkCompileC('HAVE_MATH_C99', '${CFLAGS} ${MATH_C99_CFLAGS}', '${MATH_C99_LIBS}', << 'EOF'); #include <math.h> int < at >< at > -45,10 +52,13 < at >< at > double d = 1.0; d = fabs(d); -f = fabsf(f); -return (0); +f = sqrtf(fabsf(f)); +return (f > d) ? 0 : 1; } EOF +MkCaseEnd; +MkEsac; + MkSaveIfTrue('${HAVE_MATH_C99}', 'MATH_C99_CFLAGS', 'MATH_C99_LIBS'); return (0); } [Less]

Author: vedge Date: 2015-02-19 10:22:00 -0500 (Thu, 19 Feb 2015) New Revision: 1033 Modified: trunk/BSDBuild/cc.pm trunk/BSDBuild/sys_types.pm Log: test printf for 64-bit types Modified: trunk/BSDBuild/cc.pm ... [More] =================================================================== --- trunk/BSDBuild/cc.pm2014-11-21 06:04:11 UTC (rev 1032) trunk/BSDBuild/cc.pm2015-02-19 15:22:00 UTC (rev 1033) < at >< at > -129,11 129,13 < at >< at > # XXX: should rename to HAVE_CC_LONG_DOUBLE MkPrintN('cc: checking for long double...'); TryCompile('HAVE_LONG_DOUBLE', << 'EOF'); #include <string.h> int main(int argc, char *argv[]) { long double ld = 0.1; printf("%Lf", ld); return (ld == 1.0); } EOF Modified: trunk/BSDBuild/sys_types.pm =================================================================== --- trunk/BSDBuild/sys_types.pm2014-11-21 06:04:11 UTC (rev 1032) trunk/BSDBuild/sys_types.pm2015-02-19 15:22:00 UTC (rev 1033) < at >< at > -37,28 37,35 < at >< at > MkPrintN('checking for int64_t type...'); MkCompileC('HAVE_INT64_T', '', '', << 'EOF'); #include <sys/types.h> #include <stdio.h> int main(int argc, char *argv[]) { int64_t i64 = 0; u_int64_t u64 = 0; printf("%lld %llu", (long long)i64, (unsigned long long)u64); return (i64 != 0 || u64 != 0); } EOF MkPrintN('checking for __int64 type...'); MkCompileC('HAVE___INT64', '', '', << 'EOF'); #include <sys/types.h> #include <stdio.h> int main(int argc, char *argv[]) { __int64 i64 = 0; printf("%lld", (long long)i64); return (i64 != 0); } EOF MkIfTrue('${HAVE_INT64_T}'); MkDefine('HAVE_64BIT', "yes"); MkSaveDefine('HAVE_64BIT'); MkElse; MkIfTrue('${HAVE___INT64}'); MkDefine('HAVE_64BIT', "yes"); MkSaveDefine('HAVE_64BIT'); MkElse; MkSaveUndef('HAVE_64BIT'); MkEndif; MkEndif; -MkIfTrue('${HAVE___INT64}'); -MkDefine('HAVE_64BIT', "yes"); -MkSaveDefine('HAVE_64BIT'); -MkEndif; MkElse; MkSaveUndef('HAVE_64BIT'); MkEndif; [Less]

Author: vedge Date: 2014-07-27 19:45:14 -0400 (Sun, 27 Jul 2014) New Revision: 1031 Modified: trunk/build.lib.mk Log: include libtool configuration in "depend" target Modified: trunk/build.lib.mk ... [More] =================================================================== --- trunk/build.lib.mk2014-07-22 10:41:40 UTC (rev 1030) +++ trunk/build.lib.mk2014-07-27 23:45:14 UTC (rev 1031) < at >< at > -97,7 +97,7 < at >< at > clean: clean-lib clean-subdir cleandir: clean-lib clean-subdir cleandir-lib cleandir-subdir regress: regress-subdir -depend: depend-subdir +depend: depend-subdir ${LIBTOOL_COOKIE} .SUFFIXES: .o .po .lo .c .cc .cpp .asm .l .y .m [Less]

Author: vedge Date: 2014-07-22 06:41:40 -0400 (Tue, 22 Jul 2014) New Revision: 1030 Modified: trunk/BSDBuild/kqueue.pm Log: cast to uintptr_t/intptr_t on NetBSD Modified: trunk/BSDBuild/kqueue.pm ... [More] =================================================================== --- trunk/BSDBuild/kqueue.pm2014-07-22 09:55:10 UTC (rev 1029) +++ trunk/BSDBuild/kqueue.pm2014-07-22 10:41:40 UTC (rev 1030) < at >< at > -39,8 +39,13 < at >< at > int kq, fd = -1, nev; if ((kq = kqueue()) == -1) { return (1); } +#if defined(__NetBSD__) +EV_SET(&kev, (uintptr_t)fd, EVFILT_READ, EV_ADD|EV_ENABLE|EV_ONESHOT, 0, 0, (intptr_t)NULL); +EV_SET(&kev, (uintptr_t)1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 0, (intptr_t)NULL); +#else EV_SET(&kev, fd, EVFILT_READ, EV_ADD|EV_ENABLE|EV_ONESHOT, 0, 0, NULL); -EV_SET(&kev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 1000, 0); +EV_SET(&kev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 0, NULL); +#endif nev = kevent(kq, &kev, 1, &chg, 1, NULL); return (chg.flags & EV_ERROR); } [Less]