summaryrefslogtreecommitdiff
path: root/package/ruby/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-24 16:42:26 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-24 16:42:26 +0200
commitcbdfc3b84ec5a246b83fb991fd865754b841f9c5 (patch)
tree19c96c6cd337984249264b43d548100260a3e857 /package/ruby/patches
parent36b8021619c7f7a8ec6fee10e3bfa6e7ff8d9d48 (diff)
parentba1dbc96f36abce072ac39a33bb0bd85e12a4e97 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ruby/patches')
-rw-r--r--package/ruby/patches/patch-configure141
-rw-r--r--package/ruby/patches/patch-missing_isinf_c19
-rw-r--r--package/ruby/patches/patch-missing_isnan_c11
3 files changed, 171 insertions, 0 deletions
diff --git a/package/ruby/patches/patch-configure b/package/ruby/patches/patch-configure
new file mode 100644
index 000000000..f278b96ee
--- /dev/null
+++ b/package/ruby/patches/patch-configure
@@ -0,0 +1,141 @@
+--- ruby-2.0.0-p247.orig/configure 2013-06-27 13:16:17.000000000 +0200
++++ ruby-2.0.0-p247/configure 2013-10-24 11:12:04.000000000 +0200
+@@ -7373,138 +7373,6 @@ else
+ fi
+
+
+- # -fstack-protector
+- case "$target_os" in #(
+- mingw*|nacl|haiku) :
+-
+- stack_protector=no
+- ;; #(
+- *) :
+-
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fstack-protector is accepted as CFLAGS" >&5
+-$as_echo_n "checking whether -fstack-protector is accepted as CFLAGS... " >&6; }
+- save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS $rb_cv_warnflags"
+-if test "${ac_c_werror_flag+set}"; then
+- rb_c_werror_flag="$ac_c_werror_flag"
+-else
+- unset rb_c_werror_flag
+-fi
+-ac_c_werror_flag=yes
+-
+- CFLAGS="$CFLAGS -fstack-protector"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- stack_protector=yes
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+- stack_protector=no
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-CFLAGS="$save_CFLAGS"
+-save_CFLAGS=
+-if test "${rb_c_werror_flag+set}"; then
+- ac_c_werror_flag="$rb_c_werror_flag"
+-else
+- unset ac_c_werror_flag
+-fi
+-
+- if test "x$stack_protector" = xyes; then
+-
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -fstack-protector"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fstack-protector is accepted as LDFLAGS" >&5
+-$as_echo_n "checking whether -fstack-protector is accepted as LDFLAGS... " >&6; }
+- save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS $rb_cv_warnflags"
+-if test "${ac_c_werror_flag+set}"; then
+- rb_c_werror_flag="$ac_c_werror_flag"
+-else
+- unset rb_c_werror_flag
+-fi
+-ac_c_werror_flag=yes
+-
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+- stack_protector=broken
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-
+-CFLAGS="$save_CFLAGS"
+-save_CFLAGS=
+-if test "${rb_c_werror_flag+set}"; then
+- ac_c_werror_flag="$rb_c_werror_flag"
+-else
+- unset ac_c_werror_flag
+-fi
+- LDFLAGS="$save_LDFLAGS"
+- save_LDFLAGS=
+-
+- fi
+- ;;
+-esac
+- if test "x$stack_protector" = xyes; then
+- # RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
+- case " ${XCFLAGS-} " in #(
+- *' -fstack-protector '*) :
+- ;; #(
+- ' ') :
+- XCFLAGS="-fstack-protector" ;; #(
+- *) :
+- XCFLAGS="$XCFLAGS -fstack-protector" ;;
+-esac
+- # RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
+- case " ${XLDFLAGS-} " in #(
+- *' -fstack-protector '*) :
+- ;; #(
+- ' ') :
+- XLDFLAGS="-fstack-protector" ;; #(
+- *) :
+- XLDFLAGS="$XLDFLAGS -fstack-protector" ;;
+-esac
+- # RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
+- case " ${LDFLAGS-} " in #(
+- *' -fstack-protector '*) :
+- ;; #(
+- ' ') :
+- LDFLAGS="-fstack-protector" ;; #(
+- *) :
+- LDFLAGS="$LDFLAGS -fstack-protector" ;;
+-esac
+- fi
+-
+ case "$target_os" in #(
+ mingw*) :
+
diff --git a/package/ruby/patches/patch-missing_isinf_c b/package/ruby/patches/patch-missing_isinf_c
new file mode 100644
index 000000000..6029850b9
--- /dev/null
+++ b/package/ruby/patches/patch-missing_isinf_c
@@ -0,0 +1,19 @@
+--- ruby-2.0.0-p247.orig/missing/isinf.c 2011-05-15 13:55:52.000000000 +0200
++++ ruby-2.0.0-p247/missing/isinf.c 2013-10-24 09:18:55.000000000 +0200
+@@ -5,6 +5,7 @@
+ #define _IEEE 1
+ #include <nan.h>
+
++
+ int
+ isinf(double n)
+ {
+@@ -52,6 +53,8 @@ static double zero(void) { return 0.0; }
+ static double one (void) { return 1.0; }
+ static double inf (void) { return one() / zero(); }
+
++#undef isinf
++
+ int
+ isinf(double n)
+ {
diff --git a/package/ruby/patches/patch-missing_isnan_c b/package/ruby/patches/patch-missing_isnan_c
new file mode 100644
index 000000000..f85fef4ec
--- /dev/null
+++ b/package/ruby/patches/patch-missing_isnan_c
@@ -0,0 +1,11 @@
+--- ruby-2.0.0-p247.orig/missing/isnan.c 2010-07-28 10:12:01.000000000 +0200
++++ ruby-2.0.0-p247/missing/isnan.c 2013-10-24 09:02:41.000000000 +0200
+@@ -4,6 +4,8 @@
+
+ static int double_ne(double n1, double n2);
+
++#undef isnan
++
+ int
+ isnan(double n)
+ {