From: Daniel Gollub Date: Mon, 23 Apr 2012 14:02:19 +0000 (+0200) Subject: Only call zic if available in BUILD_ROOT X-Git-Tag: upstream/20120927~104 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fbb24fe74e5ac07d32691cb9b84f623df8c46f0;p=platform%2Fupstream%2Fbuild.git Only call zic if available in BUILD_ROOT this is not the case in minimalistic crossbuild sysroots. Changes behavior of build: zic now get called with absolute path. Following location get checked: /usr/sbin/zic /usr/bin/zic /bin/zic /sbin/zic SUSE and RHEL5 is using /usr/sbin/zic ArchLinux seemd to use /usr/bin/zic at some point --- diff --git a/init_buildsystem b/init_buildsystem index 50a9087..99634e0 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -1186,7 +1186,9 @@ for PROG in /usr/bin/TeX/texhash /usr/bin/texhash ; do done if test -e $BUILD_ROOT/usr/share/zoneinfo/UTC ; then - chroot $BUILD_ROOT zic -l UTC + for PROG in /usr/sbin/zic /usr/bin/zic /bin/zic /sbin/zic ; do + test -x $BUILD_ROOT/$PROG && chroot $BUILD_ROOT $PROG -l UTC + done fi test -e $BUILD_ROOT/.build/init_buildsystem.data || HOST=`hostname`