[gentoo-commits] proj/hardened-dev:uclibc commit in: dev-lang/ruby/files/

[gentoo-commits] proj/hardened-dev:uclibc commit in: dev-lang/ruby/files/

[Anthony G. Basile]

commit:     43d35e97e3386add11a381e81c8b2d4341c3d49f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 22:18:54 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 22:18:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=43d35e97

dev-lang/ruby: upstream's patch fails

Package-Manager: portage-2.2.7
Manifest-Sign-Key: 0xF52D4BBA

---
 dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch | 40 ++++++++++-------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch b/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
index d81b616..47ecb2f 100644
--- a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
+++ b/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
@@ -1,28 +1,24 @@
---- ruby-2.0.0-p353.orig/missing/isnan.c        2010-07-28 08:12:01.000000000 +0000
-+++ ruby-2.0.0-p353/missing/isnan.c     2013-12-22 19:24:26.748314966 +0000
-@@ -2,6 +2,20 @@
+diff -Naur ruby-2.0.0-p247.orig/missing/isinf.c ruby-2.0.0-p247/missing/isinf.c
+--- ruby-2.0.0-p247.orig/missing/isinf.c	2011-05-15 07:55:52.000000000 -0400
++++ ruby-2.0.0-p247/missing/isinf.c	2013-09-09 15:28:47.750452951 -0400
+@@ -52,6 +52,8 @@
+ static double one (void) { return 1.0; }
+ static double inf (void) { return one() / zero(); }
  
- #include "ruby/missing.h"
- 
-+/*
-+ * isnan() may be a macro, a function or both.
-+ * (The C99 standard defines that isnan() is a macro, though.)
-+ * http://www.gnu.org/software/automake/manual/autoconf/Function-Portability.html
-+ *
-+ * macro only: uClibc
-+ * both: GNU libc
-+ *
-+ * This file is compile if no isnan() function is available.
-+ * (autoconf AC_REPLACE_FUNCS detects only the function.)
-+ * The macro is detected by following #ifndef.
-+ */
++#undef isinf
 +
-+#ifndef isnan
+ int
+ isinf(double n)
+ {
+diff -Naur ruby-2.0.0-p247.orig/missing/isnan.c ruby-2.0.0-p247/missing/isnan.c
+--- ruby-2.0.0-p247.orig/missing/isnan.c	2010-07-28 04:12:01.000000000 -0400
++++ ruby-2.0.0-p247/missing/isnan.c	2013-09-09 15:28:32.791451837 -0400
+@@ -4,6 +4,8 @@
+ 
  static int double_ne(double n1, double n2);
  
++#undef isnan
++
  int
-@@ -15,3 +29,4 @@
+ isnan(double n)
  {
-     return n1 != n2;
- }
-+#endif