[arch-commits] Commit in ruby/trunk (PKGBUILD disable_sse2_on_i686.patch)
Anatol Pomozov
anatolik at archlinux.org
Thu Dec 25 13:34:37 UTC 2014
Date: Thursday, December 25, 2014 @ 14:34:37
Author: anatolik
Revision: 228040
upgpkg: ruby 2.2.0-1
Modified:
ruby/trunk/PKGBUILD
Deleted:
ruby/trunk/disable_sse2_on_i686.patch
----------------------------+
PKGBUILD | 30 ++++++++++--------------------
disable_sse2_on_i686.patch | 27 ---------------------------
2 files changed, 10 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-25 11:55:52 UTC (rev 228039)
+++ PKGBUILD 2014-12-25 13:34:37 UTC (rev 228040)
@@ -4,31 +4,18 @@
# Contributor: Jeramy Rutley <jrutley at gmail.com>
pkgname=('ruby' 'ruby-docs')
-pkgver=2.1.5
+pkgver=2.2.0
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.ruby-lang.org/en/'
license=('BSD' 'custom')
-# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
-# https://bugs.ruby-lang.org/issues/8000
-# wait for upstream to start supporting tk 8.6
-makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml' 'ttf-dejavu') # 'tk'
-options=('!emptydirs' '!makeflags' 'staticlibs')
+makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml' 'ttf-dejavu' 'tk')
+options=('!emptydirs' 'staticlibs')
source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz"
- 'gemrc'
- 'disable_sse2_on_i686.patch')
-sha1sums=('52f8bafb4349eaf32fb99ba3d71e46fd924af966'
- 'de4b760b7e2cd9af88ca67536ce37b950f1ee514'
- '6e919c4892ef1f02d99e5620c6aac1251fc4597c')
+ 'gemrc')
+sha1sums=('e54ae7ca6dc2da7d1edf0cc4f147beacfcbc7464'
+ 'de4b760b7e2cd9af88ca67536ce37b950f1ee514')
-
-prepare() {
- cd ruby-${pkgver}
-
- # FS#39470
- patch -Np1 -i ${srcdir}/disable_sse2_on_i686.patch
-}
-
build() {
cd ruby-${pkgver}
@@ -54,7 +41,10 @@
package_ruby() {
pkgdesc='An object-oriented language for quick and easy programming'
depends=('gdbm' 'openssl' 'libffi' 'libyaml' 'gmp' 'zlib')
- optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK'
+ optdepends=(
+ 'ruby-docs: Ruby documentation'
+ 'tk: for Ruby/TK'
+ )
provides=('rubygems' 'rake')
conflicts=('rake')
backup=('etc/gemrc')
Deleted: disable_sse2_on_i686.patch
===================================================================
--- disable_sse2_on_i686.patch 2014-12-25 11:55:52 UTC (rev 228039)
+++ disable_sse2_on_i686.patch 2014-12-25 13:34:37 UTC (rev 228040)
@@ -1,27 +0,0 @@
-diff --git a/configure.in b/configure.in
-index fc01f3b..bd9f950 100644
---- a/configure.in
-+++ b/configure.in
-@@ -858,22 +858,6 @@ if test "$GCC" = yes; then
- for oflag in -fno-fast-math; do
- RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
- done
-- AS_CASE(["$target"],
-- [*-darwin*], [
-- # doesn't seem necessary on Mac OS X
-- ],
-- [[i[4-6]86*|i386*mingw*]], [
-- RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
-- RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
-- ])
-- AS_CASE(["$XCFLAGS"],
-- [[*-msse2*]], [
-- RUBY_TRY_CFLAGS(-mstackrealign, [
-- RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign)
-- ])
-- ])
-- ]
-- )
- fi
-
- AC_ARG_WITH(opt-dir,
More information about the arch-commits
mailing list