diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-09-14 20:15:13 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-09-14 20:15:13 +0000 |
| commit | db956ebd6ec994674645cb88d2dfc819d7da2cd6 (patch) | |
| tree | 3e26df862402b249f219ed9d2e9f1f5df3852af1 | |
| parent | packaging: don't rely on 'uname -a' for build_arch (instead use same tests as... (diff) | |
| download | inkscape-db956ebd6ec994674645cb88d2dfc819d7da2cd6.tar.gz inkscape-db956ebd6ec994674645cb88d2dfc819d7da2cd6.zip | |
fix flawed test for cpu capability (r13600)
(bzr r13506.1.95)
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 3 | ||||
| -rwxr-xr-x | packaging/macosx/osx-build.sh | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 8318f9761..9a3478e67 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -282,8 +282,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" - if [ $? -eq 0 ]; then + if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 84a0d0ba9..ececf11cb 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -174,8 +174,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" - if [ $? -eq 0 ]; then + if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" |