fix ruby compile, update to latest

3 files changed, 4 insertions, 168 deletions

diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index cc34e7e5d..47a4407c9 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -4,23 +4,20 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ruby
-PKG_VERSION:=		2.0.0
-PKG_EXTRAVER:=		247
+PKG_VERSION:=		2.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c351450a0bed670e0f5ca07da3458a5b
+PKG_MD5SUM:=		e57fdbb8ed56e70c43f39c79da1654b2
 PKG_DESCR:=		interpreter for the ruby language
 PKG_SECTION:=		lang
 PKG_DEPENDS:=		librt libpthread libgcc
 PKG_BUILDDEP:=		ruby-host
+HOST_BUILDDEP:=		readline-host
 PKG_URL:=		http://www.ruby-lang.org/
-PKG_SITES:=		http://ftp.ruby-lang.org/pub/ruby/2.0/
+PKG_SITES:=		http://ftp.ruby-lang.org/pub/ruby/2.1/
 PKG_NOPARALLEL:=	1
 
 PKG_HOST_DEPENDS:=	!freebsd !cygwin
 
-DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}
-
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ruby/patches/patch-configure b/package/ruby/patches/patch-configure
deleted file mode 100644
index f278b96ee..000000000
--- a/package/ruby/patches/patch-configure
+++ /dev/null
@@ -1,141 +0,0 @@
---- 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-io_c b/package/ruby/patches/patch-io_c
deleted file mode 100644
index dea7f46fd..000000000
--- a/package/ruby/patches/patch-io_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ruby-2.0.0-p247.orig/io.c	2013-06-12 16:23:39.000000000 +0200
-+++ ruby-2.0.0-p247/io.c	2013-10-26 23:02:53.000000000 +0200
-@@ -8483,7 +8483,7 @@ do_ioctl(int fd, ioctl_req_t cmd, long n
- 
- #define DEFULT_IOCTL_NARG_LEN (256)
- 
--#ifdef __linux__
-+#if defined(__GLIBC__) && defined(__linux__)
- static long
- linux_iocparm_len(ioctl_req_t cmd)
- {
-@@ -8516,7 +8516,7 @@ ioctl_narg_len(ioctl_req_t cmd)
- #endif
- #ifdef IOCPARM_LEN
-     len = IOCPARM_LEN(cmd);	/* on BSDish systems we're safe */
--#elif defined(__linux__)
-+#elif defined(__GLIBC__) && defined(__linux__)
-     len = linux_iocparm_len(cmd);
- #else
-     /* otherwise guess at what's safe */