[arch-commits] Commit in ruby/trunk (0001-remove-db-support.patch PKGBUILD)
Thomas Dziedzic
td123 at nymeria.archlinux.org
Sat Aug 10 18:28:16 UTC 2013
Date: Saturday, August 10, 2013 @ 20:28:15
Author: td123
Revision: 192405
upgpkg: ruby 2.0.0_p247-3
remove db support and use gdbm
Added:
ruby/trunk/0001-remove-db-support.patch
Modified:
ruby/trunk/PKGBUILD
------------------------------+
0001-remove-db-support.patch | 35 +++++++++++++++++++++++++++++++++++
PKGBUILD | 15 ++++++++++-----
2 files changed, 45 insertions(+), 5 deletions(-)
Added: 0001-remove-db-support.patch
===================================================================
--- 0001-remove-db-support.patch (rev 0)
+++ 0001-remove-db-support.patch 2013-08-10 18:28:15 UTC (rev 192405)
@@ -0,0 +1,35 @@
+From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Sat, 10 Aug 2013 10:50:16 -0700
+Subject: [PATCH] remove db support
+
+---
+ ext/dbm/extconf.rb | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
+index 32a9446..2412404 100644
+--- a/ext/dbm/extconf.rb
++++ b/ext/dbm/extconf.rb
+@@ -5,17 +5,11 @@ dir_config("dbm")
+ if dblib = with_config("dbm-type", nil)
+ dblib = dblib.split(/[ ,]+/)
+ else
+- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
++ dblib = %w(libc gdbm_compat gdbm qdbm)
+ end
+
+ headers = {
+ "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
+- "db" => ["db.h"],
+- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
+- "db2" => ["db2/db.h", "db2.h", "db.h"],
+- "db3" => ["db3/db.h", "db3.h", "db.h"],
+- "db4" => ["db4/db.h", "db4.h", "db.h"],
+- "db5" => ["db5/db.h", "db5.h", "db.h"],
+ "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
+ "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
+ "qdbm" => ["qdbm/relic.h", "relic.h"],
+--
+1.8.3.4
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-10 18:20:33 UTC (rev 192404)
+++ PKGBUILD 2013-08-10 18:28:15 UTC (rev 192405)
@@ -5,20 +5,25 @@
pkgname=('ruby' 'ruby-docs')
pkgver=2.0.0_p247
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://www.ruby-lang.org/en/'
license=('BSD' 'custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
options=('!emptydirs' '!makeflags')
source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
- 'gemrc')
+ 'gemrc'
+ '0001-remove-db-support.patch')
md5sums=('60913f3eec0c4071f44df42600be2604'
- '6fb8e7a09955e0f64be3158fb4a27e7a')
+ '6fb8e7a09955e0f64be3158fb4a27e7a'
+ 'b93ff50214a3da26525244cf37b71a8f')
build() {
cd ruby-${pkgver//_/-}
+ # use gdbm because db v6 changed the license to AGPL
+ patch -Np1 -i ${srcdir}/0001-remove-db-support.patch
+
PKG_CONFIG=/usr/bin/pkg-config ./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -37,7 +42,7 @@
package_ruby() {
pkgdesc='An object-oriented language for quick and easy programming'
- depends=('openssl' 'libffi' 'libyaml')
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml')
optdepends=('tk: for Ruby/TK'
'ruby-docs: Ruby documentation')
provides=('rubygems' 'rake')
More information about the arch-commits
mailing list