diff --git a/build.sh b/build.sh index 8f2f48e..686fd65 100755 --- a/build.sh +++ b/build.sh @@ -12,24 +12,28 @@ guess_sdk_version() tmp3= file= sdk= - sdkcount=`ls tarballs/ | grep MacOSX | wc -l` - sdks=`ls tarballs/ | grep MacOSX` + guess_sdk_version_result= + sdkcount=`find tarballs/ | grep MacOSX | wc -l` if [ $sdkcount -eq 0 ]; then echo no SDK found in 'tarballs/'. please see README.md - exit + exit 1 elif [ $sdkcount -gt 1 ]; then + sdks=`find tarballs/ | grep MacOSX` for sdk in $sdks; do echo $sdk; done echo 'more than one MacOSX SDK tarball found. please set' echo 'SDK_VERSION environment variable for the one you want' - echo '(for example: run SDK_VERSION=10.x build.sh )' + echo '(for example: run SDK_VERSION=10.x build.sh )' exit 1 else - sdk=$sdks # only 1 + sdk=`find tarballs/ | grep MacOSX` tmp2=`echo $sdk | sed s/[^0-9.]//g` tmp3=`echo $tmp2 | sed s/\\\.*$//g` guess_sdk_version_result=$tmp3 echo 'found SDK version' $SDK_VERSION 'at tarballs/'$sdk fi + if [ $SDK_VERSION -eq 10.4 ]; then + SDK_VERSION=10.4u + fi export guess_sdk_version_result } diff --git a/tools/get_dependencies.sh b/tools/get_dependencies.sh index 1921f30..5e546e9 100755 --- a/tools/get_dependencies.sh +++ b/tools/get_dependencies.sh @@ -8,13 +8,13 @@ get_fedora_deps() { yum install clang llvm-devel automake autogen libtool \ libxml2-devel libuuid-devel openssl-devel bash patch \ - libstdc++-static + libstdc++-static make } get_freebsd_deps() { for pkgname in llvm-devel automake autogen libtool \ - libxml2 e2fsprogs-libuuid openssl bash; do + libxml2 e2fsprogs-libuuid openssl bash make; do echo $pkgname pkg install $pkgname done @@ -23,26 +23,27 @@ get_freebsd_deps() get_netbsd_deps() { pkgin install clang llvm-devel automake autogen libtool \ - libxml2-devel uuid-devel openssl-devel bash + libxml2-devel uuid-devel openssl-devel bash patch make } get_opensuse_deps() { - zypper install clang llvm-devel automake autogen libtool \ - libxml2-devel uuid-devel openssl-devel bash + zypper install llvm-clang-devel llvm-clang libclang automake autogen libtool \ + libxml2-devel libuuid-devel openssl bash patch make } get_mageia_deps() { urpmi ctags urpmi task-c-devel task-c++-devel clang llvm-devel automake autogen libtool \ - libxml2-dev uuid-dev openssl bash + libxml2-dev lib64uuid-dev openssl bash patch make } get_debian_deps() { for pkg in build-essential clang llvm-devel automake autogen libtool \ - libxml2-dev uuid-dev openssl bash; do apt-get -y install $pkg; + libxml2-dev uuid-dev openssl bash patch make; do + apt-get -y install $pkg; done }