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

Add Linux PPC support

Browse Source
This commit is contained in:
kytv
2011-07-30 23:25:14 +00:00
parent 18ee23960c
commit 9d3acf98ff
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/src/net/i2p/util/NativeBigInteger.java
View File

@ -147,6 +147,7 @@ public class NativeBigInteger extends BigInteger {
* @since 0.8.7 * @since 0.8.7
*/ */
private final static String JBIGI_OPTIMIZATION_ARM = "arm"; private final static String JBIGI_OPTIMIZATION_ARM = "arm";
private final static String JBIGI_OPTIMIZATION_PPC = "ppc";
/** /**
* Operating systems * Operating systems
@ -177,6 +178,8 @@ public class NativeBigInteger extends BigInteger {
private static final boolean _isArm = System.getProperty("os.arch").startsWith("arm"); private static final boolean _isArm = System.getProperty("os.arch").startsWith("arm");
private static final boolean _isPPC = System.getProperty("os.arch").contains("ppc");
/* libjbigi.so vs jbigi.dll */ /* libjbigi.so vs jbigi.dll */
private static final String _libPrefix = (_isWin || _isOS2 ? "" : "lib"); private static final String _libPrefix = (_isWin || _isOS2 ? "" : "lib");
private static final String _libSuffix = (_isWin || _isOS2 ? ".dll" : _isMac ? ".jnilib" : ".so"); private static final String _libSuffix = (_isWin || _isOS2 ? ".dll" : _isMac ? ".jnilib" : ".so");
@ -184,10 +187,12 @@ public class NativeBigInteger extends BigInteger {
private final static String sCPUType; //The CPU Type to optimize for (one of the above strings) private final static String sCPUType; //The CPU Type to optimize for (one of the above strings)
static { static {
if (_isX86) // Don't try to resolve CPU type on PPC and other non x86 hardware if (_isX86) // Don't try to resolve CPU type on non x86 hardware
sCPUType = resolveCPUType(); sCPUType = resolveCPUType();
else if (_isArm) else if (_isArm)
sCPUType = JBIGI_OPTIMIZATION_ARM; sCPUType = JBIGI_OPTIMIZATION_ARM;
else if (_isPPC && !_isMac)
sCPUType = JBIGI_OPTIMIZATION_PPC;
else else
sCPUType = null; sCPUType = null;
loadNative(); loadNative();
@ -690,7 +695,7 @@ public class NativeBigInteger extends BigInteger {
rv.add(_libPrefix + getMiddleName1() + "none_64" + _libSuffix); rv.add(_libPrefix + getMiddleName1() + "none_64" + _libSuffix);
// Add libjbigi-xxx-none.so // Add libjbigi-xxx-none.so
// Note that libjbigi-osx-none.jnilib is a 'fat binary' with both PPC and x86-32 // Note that libjbigi-osx-none.jnilib is a 'fat binary' with both PPC and x86-32
if (!_isArm) if ((!_isArm) || (!_isPPC && !_isMac))
rv.add(getResourceName(false)); rv.add(getResourceName(false));
return rv; return rv;
} }

BIN
installer/lib/jbigi/libjbigi-linux-ppc.so Normal file
View File

Binary file not shown.

3
installer/resources/postinstall.sh
View File

@ -46,6 +46,9 @@ case $HOST_OS in
elif [ `echo $OS_ARCH |grep arm` ]; then elif [ `echo $OS_ARCH |grep arm` ]; then
wrapperpath="./lib/wrapper/linux-armv5" wrapperpath="./lib/wrapper/linux-armv5"
cp ${wrapperpath}/libwrapper.so ./lib/ cp ${wrapperpath}/libwrapper.so ./lib/
elif [ `echo $OS_ARCH |grep ppc` ]; then
wrapperpath="./lib/wrapper/linux-ppc"
cp ${wrapperpath}/libwrapper.so ./lib/
elif [ "X$X86_64" = "X" ]; then elif [ "X$X86_64" = "X" ]; then
wrapperpath="./lib/wrapper/linux" wrapperpath="./lib/wrapper/linux"
cp ${wrapperpath}/libwrapper.so ./lib/ cp ${wrapperpath}/libwrapper.so ./lib/