diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:11:16 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:11:16 +0200 |
| commit | f3e84309257b915cb8820917a8dd5578f02fe974 (patch) | |
| tree | f3549b877c058c562bf01fc30a8acf23626f2e31 /package/ruby | |
| parent | 83a08921a2f21d95822ca2a8da37f1e2f85ea717 (diff) | |
patches and update for gcc 4.4.0 allmodconfig
* update gcc to 4.4.0
* update gnutls and ruby
* fix c++ issues for some packages
Diffstat (limited to 'package/ruby')
| -rw-r--r-- | package/ruby/Makefile | 17 | ||||
| -rw-r--r-- | package/ruby/patches/100-makefile-in.patch | 11 | ||||
| -rw-r--r-- | package/ruby/patches/patch-lib_fileutils_rb | 12 |
3 files changed, 8 insertions, 32 deletions
diff --git a/package/ruby/Makefile b/package/ruby/Makefile index f3dcde488..69756e8e5 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -3,36 +3,35 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -# == Doc -# * http://wiki.rubygarden.org/Ruby/page/show/RubyOnUCLinux - include ${TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 1.8.7 +PKG_VERSION:= 1.9.1-p129 PKG_RELEASE:= 1 -PKG_MD5SUM:= de906850f9a012c12ffc6e9f56fb1b66 -MASTER_SITES:= http://ftp.ruby-lang.org/pub/ruby/stable/ +PKG_MD5SUM:= c71f413514ee6341c627be2957023a5c +MASTER_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/1.9/ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +MAKE_FILE:= GNUmakefile +XAKE_FLAGS+= optflags='' debugflags='' CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --enable-wide-getaddrinfo CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes BUILD_STYLE:= auto INSTALL_STYLE:= auto +INSTALL_TARGET:= install-nodoc # Enable some ruby extension / options post-configure: - echo "option nodynamic" >> ${WRKBUILD}/ext/Setup + #echo "option nodynamic" >> ${WRKBUILD}/ext/Setup echo "socket" >> ${WRKBUILD}/ext/Setup -# Remove the /usr/lib/libruby.so and keep the static (~1M) ? post-install: rm -rf ${WRKINST}/usr/lib/site_ruby find ${WRKINST}/usr -name "*.h" -delete cp -a ${WRKINST}/usr ${IDIR_RUBY} include ${TOPDIR}/mk/pkg-bottom.mk - diff --git a/package/ruby/patches/100-makefile-in.patch b/package/ruby/patches/100-makefile-in.patch deleted file mode 100644 index ecfb49ed8..000000000 --- a/package/ruby/patches/100-makefile-in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-1.8.6.orig/Makefile.in 2007-02-13 00:01:19.000000000 +0100 -+++ ruby-1.8.6/Makefile.in 2007-05-21 22:12:54.000000000 +0200 -@@ -131,7 +131,7 @@ fake.rb: Makefile - if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \ - class File; \ - remove_const :ALT_SEPARATOR; \ -- ALT_SEPARATOR = "\\"; \ -+ ALT_SEPARATOR = "\\\\"; \ - end; \ - end; \ - ' > $@ diff --git a/package/ruby/patches/patch-lib_fileutils_rb b/package/ruby/patches/patch-lib_fileutils_rb deleted file mode 100644 index 767a389d9..000000000 --- a/package/ruby/patches/patch-lib_fileutils_rb +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- ruby-1.8.6.orig/lib/fileutils.rb 2007-03-04 16:03:11.000000000 +0100 -+++ ruby-1.8.6/lib/fileutils.rb 2007-05-21 22:14:04.000000000 +0200 -@@ -1026,7 +1026,7 @@ module FileUtils - list.each do |path| - created = nocreate - begin -- File.utime(t, t, path) -+ #File.utime(t, t, path) - rescue Errno::ENOENT - raise if created - File.open(path, 'a') { |