[DRE-commits] [ruby-mathgl] 01/02: Refresh patch: follow upstream changes

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-mathgl.

commit b20d9365f562be651a564401bacdade84bc76168
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Mar 8 17:25:58 2016 +0900

    Refresh patch: follow upstream changes
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0001-Check-C-header-Add-cflags-x-c.patch |  6 ++----
 ext/mathgl/extconf.rb                                   | 11 ++++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-Check-C-header-Add-cflags-x-c.patch b/debian/patches/0001-Check-C-header-Add-cflags-x-c.patch
index c293d38..56db141 100644
--- a/debian/patches/0001-Check-C-header-Add-cflags-x-c.patch
+++ b/debian/patches/0001-Check-C-header-Add-cflags-x-c.patch
@@ -7,11 +7,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  ext/mathgl/extconf.rb | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
-diff --git a/ext/mathgl/extconf.rb b/ext/mathgl/extconf.rb
-index 8127d09..9bbdae6 100644
 --- a/ext/mathgl/extconf.rb
 +++ b/ext/mathgl/extconf.rb
-@@ -6,10 +6,13 @@ require "mkmf"
+@@ -6,10 +6,13 @@
  #  --with-mathgl-lib=path
  
  dir_config("mathgl")
@@ -20,7 +18,7 @@ index 8127d09..9bbdae6 100644
 -exit unless have_header("mgl2/mgl.h")
 -exit unless have_library("mgl")
 +# check C++ header
-+with_cflags(" -x c++ ") do
++with_cflags(" -x c++ -lstdc++") do
 +  exit unless have_header("mgl2/type.h")
 +  exit unless have_header("mgl2/data.h")
 +  exit unless have_header("mgl2/mgl.h")
diff --git a/ext/mathgl/extconf.rb b/ext/mathgl/extconf.rb
index 9bbdae6..8127d09 100644
--- a/ext/mathgl/extconf.rb
+++ b/ext/mathgl/extconf.rb
@@ -6,13 +6,10 @@ require "mkmf"
 #  --with-mathgl-lib=path
 
 dir_config("mathgl")
-# check C++ header
-with_cflags(" -x c++ ") do
-  exit unless have_header("mgl2/type.h")
-  exit unless have_header("mgl2/data.h")
-  exit unless have_header("mgl2/mgl.h")
-  exit unless have_library("mgl")
-end
+exit unless have_header("mgl2/type.h")
+exit unless have_header("mgl2/data.h")
+exit unless have_header("mgl2/mgl.h")
+exit unless have_library("mgl")
 $objs = ["mathgl.o"]
 if have_header("mgl2/qt.h") && have_library("mgl-qt")
   $objs << "qt.o"

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