[Pkg-bitcoin-commits] [cgminer] 01/01: debian/patches/mips_roundl.patch: Remove #define of roundl causing FTBFS on mips. roundl already defined in -lm.

[Scott Sheridan Howard]

This is an automated email from the git hooks/post-receive script.

showard pushed a commit to branch master
in repository cgminer.

commit 09a315cf01622f25115aabea8e540b1f44fa5816
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Jun 8 08:25:21 2014 -0400

    debian/patches/mips_roundl.patch: Remove #define of roundl causing FTBFS on mips. roundl already defined in -lm.
---
 debian/changelog                 |  7 +++++++
 debian/patches/mips_roundl.patch | 19 +++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  5 +----
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fc4c21..0f422a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cgminer (4.3.4-2) unstable; urgency=medium
+
+  * debian/patches/mips_roundl.patch: Remove #define of roundl causing
+    FTBFS on mips. roundl already defined in -lm.
+
+ -- Scott Howard <showard at debian.org>  Fri, 06 Jun 2014 14:16:11 -0400
+
 cgminer (4.3.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/mips_roundl.patch b/debian/patches/mips_roundl.patch
new file mode 100644
index 0000000..3c1f15b
--- /dev/null
+++ b/debian/patches/mips_roundl.patch
@@ -0,0 +1,19 @@
+Description: roundl is defined in -lm, no need for this #define
+Author: Scott Howard <showard at debian.org>
+
+Index: cgminer/miner.h
+===================================================================
+--- cgminer.orig/miner.h	2014-06-03 11:46:10.560017536 -0400
++++ cgminer/miner.h	2014-06-06 14:14:23.974284601 -0400
+@@ -208,11 +208,6 @@
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+ #endif
+ 
+-#ifdef MIPSEB
+-#ifndef roundl
+-#define roundl(x)   (long double)((long long)((x==0)?0.0:((x)+((x)>0)?0.5:-0.5)))
+-#endif
+-#endif
+ 
+ /* No semtimedop on apple so ignore timeout till we implement one */
+ #ifdef __APPLE__
diff --git a/debian/patches/series b/debian/patches/series
index 9a9d9b6..28906ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 system_jansson.patch
 kfreebsd_usb.patch
+mips_roundl.patch
diff --git a/debian/rules b/debian/rules
index 012c81b..0c9e247 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ DRIVERS= --enable-avalon \
          --enable-bitforce \
          --enable-bitfury \
          --enable-drillbit \
+         --enable-cointerra \
          --enable-hashfast \
          --enable-icarus \
          --enable-klondike \
@@ -27,10 +28,6 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux)
            --enable-spondoolies
 endif
 
-ifneq ($(DEB_BUILD_ARCH),mips)
- DRIVERS+= --enable-cointerra
-endif
-
 %:
 	dh $@ --with autoreconf
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/cgminer.git