mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 17:10:48 +00:00
46 lines
1 KiB
Diff
46 lines
1 KiB
Diff
|
From: Yury G. Kudryashov <urkud.urkud@gmail.com>
|
||
|
|
Subject: [PATCH] Fix compilation with ruby-1.9
|
||
|
|
|
||
|
|
__FILE__ is a relative path in ruby-1.9
|
||
|
|
|
||
|
|
---
|
||
|
|
admin/Makefile.rb | 4 ++--
|
||
|
|
admin/qpp | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/admin/Makefile.rb b/admin/Makefile.rb
|
||
|
|
index 592f5a5..33fe688 100755
|
||
|
|
--- a/admin/Makefile.rb
|
||
|
|
+++ b/admin/Makefile.rb
|
||
|
|
@@ -6,7 +6,7 @@
|
||
|
|
|
||
|
|
cwd = File.dirname( __FILE__ )
|
||
|
|
require 'find'
|
||
|
|
-require "#{cwd}/platform.rb"
|
||
|
|
+require_relative 'platform'
|
||
|
|
|
||
|
|
|
||
|
|
######################################################################### defs
|
||
|
|
@@ -158,4 +158,4 @@ puts <<-EOS
|
||
|
|
.PHONY: dist
|
||
|
|
dist:
|
||
|
|
git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2
|
||
|
|
-EOS
|
||
|
|
\ No newline at end of file
|
||
|
|
+EOS
|
||
|
|
diff --git a/admin/qpp b/admin/qpp
|
||
|
|
index 36b2d05..ee840fd 100755
|
||
|
|
--- a/admin/qpp
|
||
|
|
+++ b/admin/qpp
|
||
|
|
@@ -4,7 +4,7 @@
|
||
|
|
|
||
|
|
cwd=File.dirname __FILE__
|
||
|
|
require 'find'
|
||
|
|
-require "#{cwd}/findsrc"
|
||
|
|
+require_relative 'findsrc'
|
||
|
|
|
||
|
|
sources = Array.new
|
||
|
|
headers = Array.new
|
||
|
|
--
|
||
|
|
tg: (f0b3239..) t/ruby19 (depends on: master)
|