[DRE-commits] [SCM] ruby-unf-ext.git branch, master, updated. debian/0.0.4-1-4-g6c9d22e

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 4473e3fd406bebbbb7933d8fadcae67432addf52
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Jun 13 20:21:23 2012 +0900

    New patch 0002-Force-using-CXX-instead-of-CC.patch
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index 3aed446..6b7ef43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-unf-ext (0.0.4-2) unstable; urgency=low
+
+  * Update patch handling: use gbp-pq
+  * Imported Upstream version 0.0.5
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Wed, 13 Jun 2012 20:20:33 +0900
+
 ruby-unf-ext (0.0.4-1) unstable; urgency=low
 
   * New upstream version 0.0.4
diff --git a/debian/patches/0002-force-using-CXX-instead-of-CC.patch b/debian/patches/0002-force-using-CXX-instead-of-CC.patch
new file mode 100644
index 0000000..e4e9ed5
--- /dev/null
+++ b/debian/patches/0002-force-using-CXX-instead-of-CC.patch
@@ -0,0 +1,34 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Wed, 13 Jun 2012 20:19:20 +0900
+Subject: force using g++ instead of gcc
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ ext/unf_ext/extconf.rb |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/ext/unf_ext/extconf.rb b/ext/unf_ext/extconf.rb
+index f686a4a..7dca3cd 100644
+--- a/ext/unf_ext/extconf.rb
++++ b/ext/unf_ext/extconf.rb
+@@ -1,13 +1,17 @@
+ require 'mkmf'
+-have_library('stdc++')
++CONFIG.delete('CC')
++CONFIG['CC'] = "g++"
++unless have_library('stdc++')
++  $LIBS = "-lstdc++ " + $LIBS
++end
+ have_header('ruby/encoding.h')
+ create_makefile 'unf_ext'
+ 
+ unless CONFIG['CXX']
+   case CONFIG['CC']
+-  when %r{((?:.*[-/])?)gcc([-0-9.]*)$}
++  when %r{((?:.*[-/])?)gcc([-0-9.]*)\s*?$}
+     cxx = $1 + 'g++' + $2
+-  when %r{((?:.*[-/])?)clang([-0-9.]*)$}
++  when %r{((?:.*[-/])?)clang([-0-9.]*)\s*?$}
+     cxx = $1 + 'clang++' + $2
+   else
+     cxx = CONFIG['CC']
diff --git a/debian/patches/series b/debian/patches/series
index 899f284..26334f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Drop-Bundler-depndencies.patch
+0002-force-using-CXX-instead-of-CC.patch

-- 
ruby-unf-ext.git