From 4c76a93adb2c166aed1eba9586e9040516f4cf87 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Sat, 31 Dec 2011 22:46:49 +0000
Subject: [PATCH] Add CPU type check for OSX
I removed Tanuki's broken CPU "bitness" check for OSX in
3db46be1ede7d858b6c319905cf310d99227eb29. With this commit I add one that
works. Note that at this point we don't use the "bitness" checking because we
ship a quad-fat wrapper for OSX. Unfortunately, one can only manipulate the osx
binaries with "lipo" which is only available in OSX. In the future we may want
to use the "bitness" logic.
In any case, the old check set the bits to 64 for Leopard and above, but just
because a Mac is running Leopard or Snow Leopard doesn't mean it's 64bit
capable. This addition of mine will actually check the flags using sysctl. I'm
not using uname because OSX < Lion starts in 32bit mode by default (but can
still run 64bit binaries).
---
installer/resources/i2prouter | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index f6d80be237..f911535d40 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -357,7 +357,11 @@ if [ "$DIST_OS" = "macosx" ]
then
OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
DIST_ARCH="universal"
- DIST_BITS="64"
+ if [ $(sysctl -n hw.cpu64bit_capable) -eq 1 ]; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
APP_PLIST=${APP_PLIST_BASE}.plist
else
--
GitLab