[DRE-commits] [ruby-bdb] 04/04: Check whether constants were already defined before removing them at build time

[Gunnar Wolf]

This is an automated email from the git hooks/post-receive script.

gwolf pushed a commit to branch master
in repository ruby-bdb.

commit 63f1037393397c4be748974d0d269bf4cc5299c0
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Fri Jan 17 13:58:59 2014 -0600

    Check whether constants were already defined before removing them at build time
---
 debian/changelog                       |  4 ++-
 debian/patches/remove_constants_safely | 50 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9f7b828..4c5424a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ ruby-bdb (0.6.6-1) UNRELEASED; urgency=low
   [ Gunnar Wolf ]
   * New upstream version
   * Drop transitional packages
-  * Drop hard dependency on ruby1.8
+  * Drop hard dependency on ruby1.8 (closes: 730960)
+  * Check whether constants were already defined before removing them at
+    build time
 
  -- Gunnar Wolf <gwolf at debian.org>  Fri, 17 Jan 2014 13:25:35 -0600
 
diff --git a/debian/patches/remove_constants_safely b/debian/patches/remove_constants_safely
new file mode 100644
index 0000000..fb044b6
--- /dev/null
+++ b/debian/patches/remove_constants_safely
@@ -0,0 +1,50 @@
+Author: Gunnar Wolf <gwolf at debian.org>
+Forwarded: no
+Last-Update: 2014-01-17
+Description: Fixes FTBFS constant CONFTEST_C was not yet defined
+
+Index: ruby-bdb/bdbxml2/features.rb
+===================================================================
+--- ruby-bdb.orig/bdbxml2/features.rb	2014-01-17 13:51:45.000000000 -0600
++++ ruby-bdb/bdbxml2/features.rb	2014-01-17 13:55:48.000000000 -0600
+@@ -1,5 +1,9 @@
+ class Object
+-   remove_const('CONFTEST_C')
++  begin
++    remove_const('CONFTEST_C')
++  rescue NameError
++    # CONFTEST_C was not yet defined, do nothing
++  end
+ end
+ 
+ CONFTEST_C = 'conftest.cxx'
+Index: ruby-bdb/src/features.rb
+===================================================================
+--- ruby-bdb.orig/src/features.rb	2014-01-17 13:51:45.000000000 -0600
++++ ruby-bdb/src/features.rb	2014-01-17 13:55:40.000000000 -0600
+@@ -813,7 +813,11 @@
+ begin
+    conftest = CONFTEST_C.dup
+    class Object
+-      remove_const('CONFTEST_C')
++     begin
++       remove_const('CONFTEST_C')
++     rescue NameError
++       # CONFTEST_C was not yet defined, do nothing
++     end
+    end
+ 
+    CONFTEST_C = 'conftest.cxx'
+@@ -878,7 +882,11 @@
+ 
+ ensure
+    class Object
+-      remove_const('CONFTEST_C')
++     begin
++       remove_const('CONFTEST_C')
++     rescue NameError
++       # CONFTEST_C was not yet defined, do nothing
++     end
+    end
+ 
+    CONFTEST_C = conftest
diff --git a/debian/patches/series b/debian/patches/series
index f293380..858da5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ doc-in-a-single-dir.patch
 dont-check-patch-level.patch
 fail-make-test-if-tests-fail.patch
 add-support-for-libdb_version_5_and_higher.patch
+remove_constants_safely

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-bdb.git