From e7fbb8124996089bd89462b4104c05aad1e0d01b Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Sat, 15 May 2010 21:17:29 +0700 Subject: [PATCH] Remove redundant $HOME variable usage. Option to select count of make threads. --- autobuild/synfigstudio-linux-build.sh | 37 ++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/autobuild/synfigstudio-linux-build.sh b/autobuild/synfigstudio-linux-build.sh index 51ddb76..2fdb640 100644 --- a/autobuild/synfigstudio-linux-build.sh +++ b/autobuild/synfigstudio-linux-build.sh @@ -50,6 +50,7 @@ PREFIX=$HOME/synfig/ PACKAGES_PATH=$HOME/synfig-packages # path where to write packages files PACKAGES_BUILDROOT=/tmp/synfig-buildroot # path of for build infrastructure +MAKE_THREADS=2 #count of threads for make # full = clean, configure, make # standart = configure, make @@ -101,7 +102,7 @@ if [ ! -d ${PREFIX}/include/sigc++-2.0 ]; then cd libsigc++-${LIBSIGCPP} #make clean || true ./configure --prefix=${PREFIX}/ --includedir=${PREFIX}/include --disable-static --enable-shared - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -116,7 +117,7 @@ if [ ! -d ${PREFIX}/include/glibmm-2.4 ]; then cd glibmm-${GLIBMM} #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --disable-fulldocs - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -131,7 +132,7 @@ if [ ! -d ${PREFIX}/include/libxml++-2.6 ]; then cd libxml++-${LIBXMLPP} #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -170,7 +171,7 @@ if [ ! -d ${PREFIX}/include/ImageMagick ]; then --without-openexr sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -184,7 +185,7 @@ mkglew() cd glew #[[ $DOCLEAN == 1 ]] && make clean || true sed -i -e 's/\r//g' config/config.guess - make -j2 + make -j$MAKE_THREADS make install GLEW_DEST=${PREFIX} libdir=/lib bindir=/bin includedir=/include cd .. popd @@ -198,7 +199,7 @@ if [ ! -d ${PREFIX}/include/cairomm-1.0 ]; then cd cairomm-${CAIROMM} #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --enable-docs=no - make -j2 + make -j$MAKE_THREADS make install cd .. fi @@ -212,7 +213,7 @@ if [ ! -d ${PREFIX}/include/gtkmm-2.4 ]; then cd gtkmm-${GTKMM} #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --disable-examples --disable-demos --disable-docs - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -226,7 +227,7 @@ mkfreeglut() cd freeglut-${FREEGLUT} #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --disable-warnings --enable-shared - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -250,7 +251,7 @@ mkftgl() cd unix #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --with-gl-inc=${PREFIX}/include --with-gl-lib=${PREFIX}/lib --with-glut-inc=${PREFIX}/include --with-glut-lib=${PREFIX}/lib --with-x - make all -j2 + make all -j$MAKE_THREADS make install cd .. popd @@ -263,7 +264,7 @@ mkgtkglext() cd gtkglext-${GTKGLEXT} #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-gtk-doc --disable-static --enable-shared - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -276,7 +277,7 @@ mkgtkglextmm() cd gtkglextmm-${GTKGLEXTMM} #[[ $DOCLEAN == 1 ]] && make clean || true ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-dependency-tracking --disable-static --enable-shared - make -j2 + make -j$MAKE_THREADS make install popd cd .. @@ -288,7 +289,7 @@ mkgit() [ ! -d git-${GITVERSION} ] && tar -xjf git-${GITVERSION}.tar.bz2 cd git-${GITVERSION} ./configure - make -j2 + make -j$MAKE_THREADS make install cd .. popd @@ -316,7 +317,7 @@ if [[ $MODE != 'quick' ]]; then /bin/sh ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include $DEBUG fi -make -j2 +make -j$MAKE_THREADS make install popd @@ -353,7 +354,7 @@ fi # export LDFLAGS='' #fi -make -j2 +make -j$MAKE_THREADS make install popd @@ -374,7 +375,7 @@ if [[ $MODE != 'quick' ]]; then /bin/sh ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared $DEBUG fi -make -j2 +make -j$MAKE_THREADS make install for n in AUTHORS COPYING NEWS README @@ -718,9 +719,9 @@ mkpackage() if [[ `cat /etc/chroot.id` == "Synfig Packages Buildroot" ]]; then echo "We are in chroot now." - echo "[user]" > $HOME/.gitconfig - echo "email = packages@synfig.org" >> $HOME/.gitconfig - echo "name = Synfig Packager" >> $HOME/.gitconfig + echo "[user]" > /root/.gitconfig + echo "email = packages@synfig.org" >> /root/.gitconfig + echo "name = Synfig Packager" >> /root/.gitconfig -- 2.7.4