AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2prouter: add amdfx* as an x64 CPU / move ldd check

Browse Source
This commit is contained in:
kytv
2014-06-12 00:41:14 +00:00
parent ed85a2b82b
commit e968828916
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
installer/resources/i2prouter
View File

@@ -241,16 +241,6 @@ failed() {
exit 1
}
if $(which ldd > /dev/null 2>&1); then
# This should cover every *NIX other than OSX since OSX doesn't have ldd.
# OSX has otool. Is otool on every OSX installation? Is otool's output the same as ldd's?
# The wrapper we ship for OSX are for PPC and Intel, so maybe we don't need to worry about OSX?
if (ldd "$WRAPPER_CMD" |grep -q 'not found') > /dev/null 2>&1 || \
! (ldd "$WRAPPER_CMD" > /dev/null 2>&1); then
failed
fi
fi
if [ -n "$FIXED_COMMAND" ]
then
COMMAND="$FIXED_COMMAND"
@@ -433,7 +423,7 @@ else
DIST_BITS="32"
fi
;;
'amd64' | 'x86_64')
amdfx* | 'amd64' | 'x86_64')
DIST_ARCH="x86"
DIST_BITS="64"
;;
@@ -613,6 +603,17 @@ if [ ! -r "${WRAPPER_CMD}" ]; then
exit 1
fi
if $(which ldd > /dev/null 2>&1); then
# This should cover every *NIX other than OSX since OSX doesn't have ldd.
# OSX has otool. Is otool on every OSX installation? Is otool's output the same as ldd's?
# The wrapper we ship for OSX are for PPC and Intel, so maybe we don't need to worry about OSX?
if (ldd "$WRAPPER_CMD" |grep -q 'not found') > /dev/null 2>&1 || \
! (ldd "$WRAPPER_CMD" > /dev/null 2>&1); then
failed
fi
fi
# Build the nice clause
if [ "X$PRIORITY" = "X" ]
then