diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-04-05 17:34:32 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-04-05 17:34:32 +0400 |
| commit | d070940192561dab0f95ac2e28ac5a775007ae0d (patch) | |
| tree | 8bd65de6ecb0673347cfcfcee7630a55fb75cd95 | |
| parent | 5ad071633f5501c707c59b58910537b451cf14c7 (diff) | |
More fixes for install_deps.sh under ubuntu 10.04: git package is called "git-core", and 'apt-cache policy' returns a different result than newer versions when no package is found, changed the "available deb package" test to use "apt-cache show" instead.
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index d23ea0ba0ec..a2b5ccf4ee9 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1207,7 +1207,7 @@ get_package_version_DEB() { } check_package_DEB() { - r=`apt-cache policy $1 | grep -c 'Candidate:'` + r=`apt-cache show $1 | grep -c 'Package:'` if [ $r -ge 1 ]; then return 0 @@ -1298,17 +1298,17 @@ install_DEB() { THEORA_USE=true # Install newest libtiff-dev in debian/ubuntu. - TIFF="libtiff5" + TIFF="libtiff" check_package_DEB $TIFF if [ $? -eq 0 ]; then _packages="$_packages $TIFF-dev" else - TIFF="libtiff4" # Some old distro, like e.g. ubuntu 10.04 :/ + TIFF="libtiff5" check_package_DEB $TIFF if [ $? -eq 0 ]; then _packages="$_packages $TIFF-dev" else - TIFF="libtiff" + TIFF="libtiff4" # Some old distro, like e.g. ubuntu 10.04 :/ check_package_DEB $TIFF if [ $? -eq 0 ]; then _packages="$_packages $TIFF-dev" @@ -1316,6 +1316,20 @@ install_DEB() { fi fi + GIT="git" + check_package_DEB $GIT + if [ $? -eq 0 ]; then + INFO $GIT + _packages="$_packages $GIT" + else + GIT="git-core" # Some old distro, like e.g. ubuntu 10.04 :/ + check_package_DEB $GIT + if [ $? -eq 0 ]; then + INFO $GIT + _packages="$_packages $GIT" + fi + fi + if $WITH_ALL; then _packages="$_packages libspnav-dev libjack-dev" fi @@ -1477,7 +1491,7 @@ install_DEB() { else if $have_llvm; then INFO "" - install_packages_DEB flex bison libtbb-dev git + install_packages_DEB flex bison libtbb-dev # No package currently! INFO "" compile_OSL @@ -1490,7 +1504,7 @@ install_DEB() { INFO "WARNING! Skipping OpenCOLLADA installation, as requested..." else INFO "" - install_packages_DEB git libpcre3-dev libxml2-dev + install_packages_DEB libpcre3-dev libxml2-dev # Find path to libxml shared lib... _XML2_LIB=`dpkg -L libxml2-dev | grep -e ".*/libxml2.so"` # No package |