OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Feb-2005 22:45:49
Branch: HEAD Handle: 2005021621454701
Added files:
openpkg-src/zoem zoem.patch
Modified files:
openpkg-src/zoem zoem.spec
Log:
fix building under Solaris where roundl(3) exists
Summary:
Revision Changes Path
1.4 +39 -0 openpkg-src/zoem/zoem.patch
1.24 +3 -1 openpkg-src/zoem/zoem.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/zoem/zoem.patch
============================================================================
$ cvs diff -u -r0 -r1.4 zoem.patch
--- /dev/null 2005-02-16 22:45:06 +0100
+++ zoem.patch 2005-02-16 22:45:49 +0100
@@ -0,0 +1,39 @@
+Index: src/ops.c
+--- src/ops.c.orig 2004-06-21 18:58:40.000000000 +0200
++++ src/ops.c 2005-02-16 22:44:19.257105775 +0100
+@@ -52,7 +52,7 @@
+
+ static double precision_g = 1e-8;
+
+-long roundl (double f) { return (long) floor(f + 0.5) ; }
++long my_roundl (double f) { return (long) floor(f + 0.5) ; }
+
+ #define I_BANG_1 "{any}"
+ #define J_BANG_1 "strip curlies, put any"
+@@ -2014,7 +2014,7 @@
+ ; else
+ { double eps = g - floor(g+0.5)
+ ; if (eps * SIGN(eps) <= precision_g && g*SIGN(g) <= LONG_MAX)
+- yamtxt = mcxTingInteger(NULL, roundl(g))
++ yamtxt = mcxTingInteger(NULL, my_roundl(g))
+ ; else
+ yamtxt = mcxTingDouble(NULL, g, 10)
+ ; }
+@@ -2097,7 +2097,7 @@
+ ; eps = f3 - floor(f3+0.5)
+
+ ; if (eps * SIGN(eps) <= precision_g && f3*SIGN(f3) <= LONG_MAX)
+- f3txt = mcxTingInteger(NULL, roundl(f3))
++ f3txt = mcxTingInteger(NULL, my_roundl(f3))
+ ; else
+ f3txt = mcxTingDouble(NULL, f3, 10)
+
+@@ -2187,7 +2187,7 @@
+ ; else
+ { double eps = fval - floor(fval+0.5)
+ ; if (eps * SIGN(eps) <= precision_g && fval*SIGN(fval) <= LONG_MAX)
+- valtxt = mcxTingInteger(NULL, roundl(fval))
++ valtxt = mcxTingInteger(NULL, my_roundl(fval))
+ ; else
+ valtxt = mcxTingDouble(NULL, fval, 10)
+ ; }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zoem/zoem.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 zoem.spec
--- openpkg-src/zoem/zoem.spec 1 Jan 2005 10:56:17 -0000 1.23
+++ openpkg-src/zoem/zoem.spec 16 Feb 2005 21:45:48 -0000 1.24
@@ -38,10 +38,11 @@
Group: Text
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20040622
+Release: 20050216
# list of sources
Source0: http://micans.org/zoem/src/zoem-%{V_major}-%{V_minor}.tar.gz
+Patch0: zoem.patch
# build information
Prefix: %{l_prefix}
@@ -71,6 +72,7 @@
%prep
%setup -q -n zoem-%{V_major}-%{V_minor}
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
