[DRE-commits] [ruby-mysql2] 04/05: Refresh local patches

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-mysql2.

commit b6ad64712490ec0c4a1a2088c913f5bda8996484
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Wed Jan 6 01:02:06 2016 +0000

    Refresh local patches
---
 debian/patches/remove_rpath_compilation_flag.patch | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/patches/remove_rpath_compilation_flag.patch b/debian/patches/remove_rpath_compilation_flag.patch
index cec1b5f..ef7cd23 100644
--- a/debian/patches/remove_rpath_compilation_flag.patch
+++ b/debian/patches/remove_rpath_compilation_flag.patch
@@ -5,9 +5,12 @@ Description: Remove rpath from compilation flags
 Author: Michael Franzl <office at michaelfranzl.com>
 Last-Update: 2013-11-26
 
+
+diff --git a/ext/mysql2/extconf.rb b/ext/mysql2/extconf.rb
+index ed82355..3d027f3 100644
 --- a/ext/mysql2/extconf.rb
 +++ b/ext/mysql2/extconf.rb
-@@ -143,35 +143,6 @@ if RUBY_PLATFORM =~ /mswin|mingw/
+@@ -203,35 +203,6 @@ if RUBY_PLATFORM =~ /mswin|mingw/
      # Let's do it!
      Rake::Task[vendordll].invoke
    end
@@ -23,7 +26,7 @@ Last-Update: 2013-11-26
 -    warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----"
 -    $LDFLAGS << rpath_flags
 -  else
--    if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2]
+-    if (libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2])
 -      rpath_flags = " -Wl,-rpath,#{libdir}"
 -      if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags)
 -        # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X.

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