Date: Tue, 11 Mar 2014 23:04:32 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r263058 - stable/9/tools/build/options Message-ID: <201403112304.s2BN4Ww6038698@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Mar 11 23:04:32 2014 New Revision: 263058 URL: http://svnweb.freebsd.org/changeset/base/263058 Log: MFC r253304, r255964: r253304: Ensure the locale is LC_ALL=C when regenerating src.conf.5 r255964: Have makeman always use the mk files from the source tree it's operating on rather than those from the installed system. Sponsored by: The FreeBSD Foundation Modified: stable/9/tools/build/options/makeman Directory Properties: stable/9/tools/build/options/ (props changed) Modified: stable/9/tools/build/options/makeman ============================================================================== --- stable/9/tools/build/options/makeman Tue Mar 11 22:47:04 2014 (r263057) +++ stable/9/tools/build/options/makeman Tue Mar 11 23:04:32 2014 (r263058) @@ -3,12 +3,16 @@ # This file is in the public domain. set -o errexit +LC_ALL=C ident='$FreeBSD$' t=$(mktemp -d -t makeman) trap 'test -d $t && rm -rf $t' exit +srcdir=$(realpath ../../..) +make="make -C $srcdir -m $srcdir/share/mk" + # # usage: no_targets all_targets yes_targets # @@ -26,10 +30,10 @@ no_targets() show_options() { - ALL_TARGETS=$(echo $(make -C ../../.. targets | tail -n +2)) + ALL_TARGETS=$(echo $(${make} targets | tail -n +2)) rm -f $t/settings for target in ${ALL_TARGETS} ; do - make -C ../../.. showconfig \ + ${make} showconfig \ SRCCONF=/dev/null __MAKE_CONF=/dev/null \ TARGET_ARCH=${target#*/} TARGET=${target%/*} | while read var _ val ; do @@ -92,7 +96,7 @@ show() exit 1 ;; esac - make -C ../../.. "$@" showconfig __MAKE_CONF=/dev/null | + ${make} "$@" showconfig __MAKE_CONF=/dev/null | while read var _ val ; do opt=${var#MK_} case ${val} in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403112304.s2BN4Ww6038698>