From 9745c7ac307d93f940666ad8a39555a2d1e5d1b8 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Tue, 2 Feb 2016 01:26:00 +0000 Subject: databases/ruby-bdb: fix build with Ruby 2.3 PR: 206232 Submitted by: Yasuhiro KIMURA --- databases/ruby-bdb/Makefile | 8 +------- databases/ruby-bdb/files/extra-patch-src-features.rb | 18 ------------------ databases/ruby-bdb/files/patch-src-features.rb | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 databases/ruby-bdb/files/extra-patch-src-features.rb create mode 100644 databases/ruby-bdb/files/patch-src-features.rb (limited to 'databases/ruby-bdb') diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile index 0b6ecc509bd9..0bc8dc1bac08 100644 --- a/databases/ruby-bdb/Makefile +++ b/databases/ruby-bdb/Makefile @@ -21,8 +21,6 @@ USE_BDB= yes OPTIONS_DEFINE= DOCS EXAMPLES -BROKEN_RUBY23= yes - USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_RUBY_RDOC= yes @@ -59,10 +57,6 @@ SHEBANG_FILES= examples/record.rb \ .include -.if ${RUBY_VER} >= 2.0 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-features.rb -.endif - .if ${RUBY_VER} >= 2.1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bdbxml2-bdbxml.h .endif @@ -71,7 +65,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bdbxml2-bdbxml.h EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common.c-21 .endif -.if ${RUBY_VER} == 2.2 +.if ${RUBY_VER} >= 2.2 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-common.c-22 \ ${FILESDIR}/extra-patch-src-recnum.c-22 \ ${FILESDIR}/extra-patch-src-cursor.c-22 diff --git a/databases/ruby-bdb/files/extra-patch-src-features.rb b/databases/ruby-bdb/files/extra-patch-src-features.rb deleted file mode 100644 index 6d894c93f8a4..000000000000 --- a/databases/ruby-bdb/files/extra-patch-src-features.rb +++ /dev/null @@ -1,18 +0,0 @@ ---- src/features.rb.orig 2011-04-06 19:35:39.000000000 +0000 -+++ src/features.rb 2015-01-22 16:40:53.000000000 +0000 -@@ -813,7 +813,6 @@ - begin - conftest = CONFTEST_C.dup - class Object -- remove_const('CONFTEST_C') - end - - CONFTEST_C = 'conftest.cxx' -@@ -878,7 +877,6 @@ - - ensure - class Object -- remove_const('CONFTEST_C') - end - - CONFTEST_C = conftest diff --git a/databases/ruby-bdb/files/patch-src-features.rb b/databases/ruby-bdb/files/patch-src-features.rb new file mode 100644 index 000000000000..6d894c93f8a4 --- /dev/null +++ b/databases/ruby-bdb/files/patch-src-features.rb @@ -0,0 +1,18 @@ +--- src/features.rb.orig 2011-04-06 19:35:39.000000000 +0000 ++++ src/features.rb 2015-01-22 16:40:53.000000000 +0000 +@@ -813,7 +813,6 @@ + begin + conftest = CONFTEST_C.dup + class Object +- remove_const('CONFTEST_C') + end + + CONFTEST_C = 'conftest.cxx' +@@ -878,7 +877,6 @@ + + ensure + class Object +- remove_const('CONFTEST_C') + end + + CONFTEST_C = conftest -- cgit v1.2.3