@@ -22,10 +22,9 @@ class AutoBuild (build.AutoBuild): + misc.append_path (os.environ.get ('CPLUS_INCLUDE_PATH', '')), 'LIBRARY_PATH': '%(tools_prefix)s/lib' + misc.append_path (os.environ.get ('LIBRARY_PATH', '')), - # URG, GUB's cross gcc's STAT here. GUB may break in - # interesting ways if there are cross compilers installed - # here. 'LIBRESTRICT_ALLOW': '/usr/lib/gcc:/usr/libexec/gcc', + # Not needed? + # 'LIBRESTRICT_ALLOW': misc.librestrict_allow (), 'LIBRESTRICT_IGNORE': '%(tools_prefix)s/bin/make', 'PATH': '%(cross_prefix)s/bin:%(tools_prefix)s/bin:' + os.environ['PATH'], } gub/cross.py @@ -627,13 +627,24 @@ def librestrict (): 'open').replace (':', ' ').split (' '))) def librestrict_allow (): - if not 'stat' in librestrict (): + ''' +Hmm, or set these somehow? +ac_cv_path_EGREP=${ac_cv_path_EGREP='/bin/grep -E'} +ac_cv_path_GREP=${ac_cv_path_GREP=/bin/grep} + ''' + # Let's not change the dict between relaxed/restricted builds + if False and not 'stat' in librestrict (): return '' bin = ['egrep', 'fgrep', 'grep', 'sed'] usr_bin = ['awk', 'mawk', 'nawk'] + # URG, GUB's cross gcc's STAT here. GUB may break in + # interesting ways if there are cross compilers installed + # here. + gcc = ['/usr/lib/gcc', '/usr/libexec/gcc'] return (' LIBRESTRICT_ALLOW=' + ':'.join (['/bin/' + x for x in bin] - + ['/usr/bin/' + x for x in usr_bin]) + + ['/usr/bin/' + x for x in usr_bin] + + gcc) + ':${LIBRESTRICT_ALLOW-/foo} ') def test (): gub/misc.py @@ -47,7 +47,6 @@ class Libtool (target.AutoBuild): if 'stat' in misc.librestrict (): SHELL = 'CONFIG_SHELL=%(tools_prefix)s/bin/dash ' return (SHELL - + misc.librestrict_allow () + target.AutoBuild.configure_command (self) .replace ('SHELL=', 'CONFIG_SHELL=')) gub/specs/libtool.py @@ -137,10 +137,7 @@ cd %(builddir)s && chmod +x %(configure_binary)s && %(configure_command_native)s 'CC_FOR_BUILD': 'C_INCLUDE_PATH= CPATH= CPPFLAGS= LIBRARY_PATH= cc', 'CCLD_FOR_BUILD': 'C_INCLUDE_PATH= CPATH= CPPFLAGS= LIBRARY_PATH= cc', 'LDFLAGS_FOR_BUILD': '', - # URG, GUB's cross gcc's STAT here. GUB may break in - # interesting ways if there are cross compilers installed - # here. - 'LIBRESTRICT_ALLOW': '/usr/lib/gcc:/usr/libexec/gcc', + 'LIBRESTRICT_ALLOW': misc.librestrict_allow (), 'C_INCLUDE_PATH': '', 'CPATH': '', 'CPLUS_INCLUDE_PATH': '', gub/target.py 682b87c492e58a4a40cf1a9a3c7848b77d15f90a Jan Nieuwenhuizen janneke@gnu.org http://github.com/janneke/gub/commit/44aa0e63bf41a6bd9742e7574e38311d82ab93cb 44aa0e63bf41a6bd9742e7574e38311d82ab93cb 2009-02-17T07:40:47-08:00 2009-02-17T07:39:10-08:00 Move libtool.py stat-relaxation to target.py. Fixes build of gettext [and any target package's configure that looks for /bin/grep, sed, awk]. 19e73f7b87f6d94082515c8d1640113ff2cc7db9 Jan Nieuwenhuizen janneke@gnu.org