From ffffd2deb5f0e3014bbd22531a51b8a1d1692f1e Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Sun, 12 Jun 2011 16:33:34 +0000
Subject: [PATCH] Add jcpuid binaries for Intel macs

---
 core/java/src/net/i2p/util/NativeBigInteger.java |   9 ++++++---
 history.txt                                      |   6 ++++++
 installer/lib/jbigi/libjcpuid-x86-osx.jnilib     | Bin 0 -> 4156 bytes
 installer/lib/jbigi/libjcpuid-x86_64-osx.jnilib  | Bin 0 -> 4168 bytes
 .../java/src/net/i2p/router/RouterVersion.java   |   2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 installer/lib/jbigi/libjcpuid-x86-osx.jnilib
 create mode 100644 installer/lib/jbigi/libjcpuid-x86_64-osx.jnilib

diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index bc4259992..4f51584ae 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -161,6 +161,9 @@ public class NativeBigInteger extends BigInteger {
     private static final boolean _is64 = "64".equals(System.getProperty("sun.arch.data.model")) ||
                                          System.getProperty("os.arch").contains("64");
 
+    private static final boolean _isX86 = System.getProperty("os.arch").contains("86") ||
+	                                 System.getProperty("os.arch").equals("amd64");
+
     /* libjbigi.so vs jbigi.dll */
     private static final String _libPrefix = (_isWin || _isOS2 ? "" : "lib");
     private static final String _libSuffix = (_isWin || _isOS2 ? ".dll" : _isMac ? ".jnilib" : ".so");
@@ -168,10 +171,10 @@ public class NativeBigInteger extends BigInteger {
     private final static String sCPUType; //The CPU Type to optimize for (one of the above strings)
     
     static {
-        if (_isMac) // replace with osx/mac friendly jni cpu type detection when we have one
-            sCPUType = null;
-        else
+        if (_isX86) // Don't try to resolve CPU type on PPC and other non x86 hardware
             sCPUType = resolveCPUType();
+	else
+	    sCPUType = null;
         loadNative();
     }
     
diff --git a/history.txt b/history.txt
index c8d92005b..9df07486f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2011-06-12 kytv
+   * Add jcpuid files (32 & 64bit) for Intel Macs
+   * Compile jbigi-osx-none for Intel Macs. libjbigi-osx-none.jnilib
+     is now a fat binary combining the already existing PPC 
+     compile and my new x86 build.
+
 2011-06-11 zzz
     * i2psnark Polish translation, thanks polacco
 
diff --git a/installer/lib/jbigi/libjcpuid-x86-osx.jnilib b/installer/lib/jbigi/libjcpuid-x86-osx.jnilib
new file mode 100644
index 0000000000000000000000000000000000000000..0184214018d5bcbb1519e0057695d52bcfc41872
GIT binary patch
literal 4156
zcmeHK&1(};5TCSBD@L1xhk$yK9Q2T^2Pr)ishTIov=U4k3n@O*W+Pjh-DN*aa;Oxe
z$g%|d8@zduB0YL*JqRL2iWDr=Lq!kz2k1dNleY=kTzc>%yn%W1^=97eZ%@AuzkmKY
z1^~mTM^TTXz8?a33UP>_AH{?788$bALBGU<04?<&L8TcaoI7g65x$7S{p+Uy-e7@j
zNTRUXjX7Vm9ZS>i2Z_NQ%u#?ztdYfad(!W7?&@_-uW(JT8hB%H#v1nC#5~z(Z$j81
z48~D8pUU3Ou}rp$1Ag}eT@5T@KzF-x5*@mlK<&>jYYR%%QdM1b6x%gT!*Z1C`PnRP
zXw}M&X6OoDSz0t*t&(btkEIN|kzUd@Ov0I9p7|_SPi?$?U0r)L`8fCT^Lc>POISNp
zf?WwC+G|iwU?M-5{D(M(y>qDamiRA(L<E#V({|LFGNmn8Wvi*&u*x;HZdea&<yQG&
zxj3D!b~8#*wQK~%R;~s$oIrCgqxR+wt%$j<Z4r8;;)(RNbfrnqNs$Oh1SA3y0f~S_
zKq4R!kO)Ww{!;{Iy{~tRh1QSx@ALsBpN;t7=M(MLD-69%GKv{5n*96GW80$m{0Uat
ztvykXwOikWH{!GHaKo0*;)T%{-d@T3<gILaY~N>ie(|PvJ$EN~%JkU|wk3SFi{`YC
z<xDc}vwbu%pKYNToZQ-+FWuwsHV)x_L<KX+&Ur_*-DL+ZWKk{_VM5b2=Sqi5p2g)!
z`mNwsf)^1t`h}d9gnZ)VG3*qKp0a%s;l#Okuon+FDGzhfPMF~pqq7-|4a535fCDX|
B+M)me

literal 0
HcmV?d00001

diff --git a/installer/lib/jbigi/libjcpuid-x86_64-osx.jnilib b/installer/lib/jbigi/libjcpuid-x86_64-osx.jnilib
new file mode 100644
index 0000000000000000000000000000000000000000..99275bb7828ded388f194d15cd4515db12a20a06
GIT binary patch
literal 4168
zcmeHKJ5Ll*6g~qhVC1odCKxS<q0mHjD3nkbvnXq3aaMUP*~E~`!VWUP&XRe^VnRYf
zB;HI&Y>d?W1se(q6D^iXe8gZS1sVz{Xeq#RX6`Jo4ULtVlbk#EJnnbrey93AAMPL3
z0!Y;WP=kIEeFB455XBw9RrJ>q0AquR%%GP#yZCJ<IT0f!TtJVA3S+ibv`^Y9@$!v+
z?Y(FT;_`_IER^@SVQkE@P2G4dl9hNZO@1LR>J-x(1FH%);>(z0%<4vt>Be{gbCq}_
z0xzI|;^1u+P+rKGHo?ZtY+m!Lm3V6cPZ5VHKK*}}07gW~`_LSymoYW@<Z+@q8T^Rg
zJHQcR^LptZ%>l<(wg%i~(3{au=cn~idEC@AL$hVenVBh=w*0U+okTXweAd<rhKwzf
zV>6DPYb$nku#P)z1*;gFG<3`ZToag9--f!{x0UMo`e*6s)X(oX02bP@cCO(&;@CuU
zp??c3j`=zakPqk$lK<daj~D?Dbf?dT1oFU~Wovm^)kn>&IVV4&5zZFODNF9jzQ_)x
zV%|_GBM)h&g~V8Lm#85M;dY|a8$8^qdE6ncW0}Mtxqn6MK`b}tafc0|g$#rYgbaiX
zgbaiXgbaiXgbe(D45StQdq7#-%P4%lq;Tg0Pp>O(qNKQ>xbb$y#q9E3jt@WHRCr>m
zTwAC^t)jRNW~im%9kwXTS5|_~O*gULw8|5Ee0Z0qc6fTbd~{_So80t{o7#1qJv_gu
zy6G*|9WJ?vZ60au;$OOWi61EZP~|^V{%Z~U;rN@f_$l*j<KsD+h$K>XtGD)RmNRX`
z%_Q2bA-Ja-x_#f%Sl1Ddv{nl`Sqr+aIVke=0%-;bwGJ8WNekBF+U%VKKs_vxhLu1f
zD7Z`un)I?Cq+(Qx*4Ng(!OCsS(S2`^jy((XG(_lFV|1x1LeLF05mM)i)gUp_H7Hd*
b?Z<@nV`sIW7k0B;!FwrmRKq@9a?1V!)1~%c

literal 0
HcmV?d00001

diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f0b07e77..b7509f1d3 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 24;
+    public final static long BUILD = 25;
 
     /** for example "-test" */
     public final static String EXTRA = "";