From ecd96744118b4032ea10013b95e68cfc615e2f99 Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Thu, 20 Dec 2012 12:39:08 +0000
Subject: Fix build on Solaris. Fix "call of overloaded 'log(unsigned char&)'
 is ambiguous" error.

---
 archivers/xmill/distinfo                           |  3 ++-
 .../patches/patch-XMill_BaseXNumCompressor.cpp     | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 archivers/xmill/patches/patch-XMill_BaseXNumCompressor.cpp

(limited to 'archivers')

diff --git a/archivers/xmill/distinfo b/archivers/xmill/distinfo
index 549713e6b31..293a5dacfd6 100644
--- a/archivers/xmill/distinfo
+++ b/archivers/xmill/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2008/05/24 23:00:18 tnn Exp $
+$NetBSD: distinfo,v 1.8 2012/12/20 12:39:08 ryoon Exp $
 
 SHA1 (xmill-0.9.1.tar.gz) = 491e44ea9a66293af6837db4dc54ed63065c0d67
 RMD160 (xmill-0.9.1.tar.gz) = 7ca0e60b16e609997010a94f2bffd3a5c2ab60ff
 Size (xmill-0.9.1.tar.gz) = 1021363 bytes
+SHA1 (patch-XMill_BaseXNumCompressor.cpp) = 25f7a973c241f5aa7061cdae2dd865bc0cd428d7
 SHA1 (patch-aa) = b4f10f11906bdcc927214823f93ef597c0d4b750
 SHA1 (patch-ab) = 1d615fa8446139215d7f53cb2d2c91915786aa9f
 SHA1 (patch-ac) = f105a84458fdb2527341d05ce612b73450077894
diff --git a/archivers/xmill/patches/patch-XMill_BaseXNumCompressor.cpp b/archivers/xmill/patches/patch-XMill_BaseXNumCompressor.cpp
new file mode 100644
index 00000000000..89fad290048
--- /dev/null
+++ b/archivers/xmill/patches/patch-XMill_BaseXNumCompressor.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-XMill_BaseXNumCompressor.cpp,v 1.1 2012/12/20 12:39:08 ryoon Exp $
+
+* Fix build on SmartOS
+
+--- XMill/BaseXNumCompressor.cpp.orig	2003-01-04 23:09:36.000000000 +0000
++++ XMill/BaseXNumCompressor.cpp
+@@ -76,7 +76,7 @@ void BaseXNumCompressor::Init(
+ 		maxdigits = 4;
+ 	} else {
+ 		/* a hack to get 1<<32 without overflow.. */
+-		maxdigits = log(65536.0*65536.0) / log(base);
++		maxdigits = log(65536.0*65536.0) / log((float) base);
+ 	}
+ }
+ 
+@@ -258,7 +258,7 @@ void BaseXNumUncompressor::Init(
+ 		maxdigits = 4;
+ 	} else {
+ 		/* a hack to get 1<<32 without overflow.. */
+-		maxdigits = log(65536.0*65536.0) / log(base);
++		maxdigits = log(65536.0*65536.0) / log((float) base);
+ 		startdiv = 1;
+ 		for (int i=1; i<maxdigits; i++)
+ 			startdiv *= base;
-- 
cgit v1.2.3