| 1 |
maksbotan 13/03/31 09:03:29 |
| 2 |
|
| 3 |
Added: ruby1.9_fix_deprection.patch |
| 4 |
0004-ruby_runpath_fix-1.3.5.patch |
| 5 |
Log: |
| 6 |
Fix issue with glibc 2.16, bug #463894. Fix error with ruby 19, bug #444808. Thanks to slepnoga. |
| 7 |
|
| 8 |
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/1.3.7/ruby1.9_fix_deprection.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: ruby1.9_fix_deprection.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/ruby/Makefile.am b/ruby/Makefile.am |
| 19 |
--- a/ruby/Makefile.am |
| 20 |
+++ b/ruby/Makefile.am |
| 21 |
@@ -44,11 +44,11 @@ |
| 22 |
RUBY=$(RUBY) RAKE=$(RAKE) |
| 23 |
|
| 24 |
all: |
| 25 |
- $(RAKE) build |
| 26 |
- $(RAKE) rdoc |
| 27 |
+ $(RAKE) -v build |
| 28 |
+ $(RAKE) -v rdoc |
| 29 |
|
| 30 |
-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']") |
| 31 |
-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']") |
| 32 |
+RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']") |
| 33 |
+RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']") |
| 34 |
|
| 35 |
install: |
| 36 |
$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB) |
| 37 |
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in |
| 38 |
--- a/ruby/Rakefile.in |
| 39 |
+++ b/ruby/Rakefile.in |
| 40 |
@@ -17,9 +17,9 @@ |
| 41 |
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 42 |
|
| 43 |
require 'rake/clean' |
| 44 |
-require 'rake/rdoctask' |
| 45 |
+require 'rdoc/task' |
| 46 |
require 'rake/testtask' |
| 47 |
-require 'rake/gempackagetask' |
| 48 |
+require 'rubygems/package_task' |
| 49 |
|
| 50 |
PKG_NAME='@PACKAGE_NAME@' |
| 51 |
PKG_VERSION='@PACKAGE_VERSION@' |
| 52 |
@@ -108,7 +108,7 @@ |
| 53 |
EOF |
| 54 |
end |
| 55 |
|
| 56 |
-Rake::GemPackageTask.new(SPEC) do |pkg| |
| 57 |
+Gem::PackageTask.new(SPEC) do |pkg| |
| 58 |
pkg.need_tar = true |
| 59 |
pkg.need_zip = true |
| 60 |
end |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.1 app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch?rev=1.1&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/hivex/files/1.3.7/0004-ruby_runpath_fix-1.3.5.patch?rev=1.1&content-type=text/plain |
| 68 |
|
| 69 |
Index: 0004-ruby_runpath_fix-1.3.5.patch |
| 70 |
=================================================================== |
| 71 |
--- ruby/Rakefile.in 2012-03-13 19:46:43.000000000 +0400 |
| 72 |
+++ ruby/Rakefile.in 2012-04-15 19:02:42.337118192 +0400 |
| 73 |
@@ -38,7 +38,7 @@ |
| 74 |
# Build locally |
| 75 |
|
| 76 |
file MAKEFILE => EXT_CONF do |t| |
| 77 |
- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs" |
| 78 |
+ unless sh "top_srcdir=@top_srcdir@; top_builddir=@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/hivex; cd @builddir@/ext/hivex; @RUBY@ #{EXT_CONF} --with-_hivex-include=../../$top_srcdir/lib --with-_hivex-lib=../../$top_builddir/lib/.libs --with-ldflags=\"$LDFLAGS\"" |
| 79 |
$stderr.puts "Failed to run extconf" |
| 80 |
break |
| 81 |
end |
Archives