diff options
| author | Tilman Sauerbeck <tilman@crux.nu> | 2010-09-02 10:57:59 +0200 |
|---|---|---|
| committer | Tilman Sauerbeck <tilman@crux.nu> | 2010-09-02 10:59:01 +0200 |
| commit | e0039e4825379adf017f5b7ed9bc4e66421aac88 (patch) | |
| tree | 224efe65578f4e7b6996477df037cfa7a596a932 /ruby | |
| parent | 330627cc08f9c6b23e8a8127fb7e04123eddf350 (diff) | |
| download | opt-e0039e4825379adf017f5b7ed9bc4e66421aac88.tar.gz opt-e0039e4825379adf017f5b7ed9bc4e66421aac88.tar.xz | |
ruby: fixed installation of binaries.
This fixes the installation of binaries even with slightly unusual
PKGMK_WORK_DIRs.
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/.md5sum | 1 | ||||
| -rw-r--r-- | ruby/Pkgfile | 5 | ||||
| -rw-r--r-- | ruby/ruby-install.patch | 14 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ruby/.md5sum b/ruby/.md5sum index 55149c1c8..a3a3a252d 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1,2 +1,3 @@ d8a02cadf57d2571cd4250e248ea7e4b ruby-1.9.2-p0.tar.bz2 d3e02c8f15bd0000af7c5854b897b220 ruby-arch.patch +34c99219466a947750a54bdc98d68371 ruby-install.patch diff --git a/ruby/Pkgfile b/ruby/Pkgfile index cca5769f8..1096ee32d 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -5,14 +5,15 @@ name=ruby version=1.9.2-p0 -release=1 +release=2 source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \ - $name-arch.patch) + $name-arch.patch $name-install.patch) build () { cd $name-$version patch -p0 -i $SRC/$name-arch.patch + patch -p1 -i $SRC/$name-install.patch ./configure --prefix=/usr \ --mandir=/usr/man \ diff --git a/ruby/ruby-install.patch b/ruby/ruby-install.patch new file mode 100644 index 000000000..b61d4f76d --- /dev/null +++ b/ruby/ruby-install.patch @@ -0,0 +1,14 @@ +This fixes the installation of binaries if PKGMK_WORK_DIR is something like + /home/foo/.tmp/pkgmk/work/$name + +diff -aur ruby-1.9.2-p0.orig/tool/rbinstall.rb ruby-1.9.2-p0/tool/rbinstall.rb +--- ruby-1.9.2-p0.orig/tool/rbinstall.rb 2010-07-24 12:37:26.000000000 +0200 ++++ ruby-1.9.2-p0/tool/rbinstall.rb 2010-09-02 10:41:21.417001125 +0200 +@@ -404,7 +404,6 @@ + end + for src in Dir[File.join(srcdir, "bin/*")] + next unless File.file?(src) +- next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src + + name = RbConfig.expand(trans[File.basename(src)]) + |