diff options
| author | Juergen Daubert <jue@jue.li> | 2010-07-04 13:19:06 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2010-07-04 13:20:28 +0200 |
| commit | a46da40917a14b15e2a779c280b91524a7af0c41 (patch) | |
| tree | c37ea71caf4ac0367c1cce663b513681461db10a /ruby | |
| parent | 614c2abb3126681f8967396dc5f84509b9ff54c4 (diff) | |
| download | opt-a46da40917a14b15e2a779c280b91524a7af0c41.tar.gz opt-a46da40917a14b15e2a779c280b91524a7af0c41.tar.xz | |
ruby: update to 1.9.1-p429
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/.md5sum | 4 | ||||
| -rw-r--r-- | ruby/Pkgfile | 13 | ||||
| -rw-r--r-- | ruby/ruby-arch.patch | 7 |
3 files changed, 14 insertions, 10 deletions
diff --git a/ruby/.md5sum b/ruby/.md5sum index 261286744..1588ad2e1 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1,2 +1,2 @@ -5922459622a23612eb9b68a3586cb5f8 ruby-1.9.1-p378.tar.bz2 -47d04c87886689f454361249d255d823 ruby-arch.patch +09df32ae51b6337f7a2e3b1909b26213 ruby-1.9.1-p429.tar.bz2 +d3e02c8f15bd0000af7c5854b897b220 ruby-arch.patch diff --git a/ruby/Pkgfile b/ruby/Pkgfile index 8970049dd..c56b2d097 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db, gdbm, ncurses, openssl, readline, zlib name=ruby -version=1.9.1-p378 +version=1.9.1-p429 release=1 source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \ $name-arch.patch) @@ -12,13 +12,18 @@ source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \ build () { cd $name-$version - patch -p1 < $SRC/$name-arch.patch - + patch -p0 -i $SRC/$name-arch.patch + + # http://redmine.ruby-lang.org/issues/show/3528 + # http://redmine.ruby-lang.org/issues/show/2727 + export CFLAGS=$(sed 's/-O[1-9]*/-O0/' <<<$CFLAGS) + ./configure --prefix=/usr \ --mandir=/usr/man \ --enable-shared \ --disable-install-doc \ - --with-ruby-version=minor + --with-ruby-version=minor \ + optflags='' make -j1 make DESTDIR=$PKG install diff --git a/ruby/ruby-arch.patch b/ruby/ruby-arch.patch index 6c9f53da1..932be2b05 100644 --- a/ruby/ruby-arch.patch +++ b/ruby/ruby-arch.patch @@ -1,7 +1,6 @@ -diff -Nru ruby-1.9.1-p129.orig/configure ruby-1.9.1-p129/configure ---- ruby-1.9.1-p129.orig/configure 2009-06-11 16:48:17.886630091 +0200 -+++ ruby-1.9.1-p129/configure 2009-06-11 16:48:39.136631089 +0200 -@@ -22515,7 +22515,7 @@ +--- configure.orig 2010-07-04 12:04:10.423030773 +0200 ++++ configure 2010-07-04 12:04:22.913029424 +0200 +@@ -11813,7 +11813,7 @@ _ACEOF else |