[DRE-commits] [ruby-pg] 03/06: refresh patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-pg.

commit b02ea2976d6a364fb63fbe3e5163b474625443dd
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 3 20:05:26 2015 +0530

    refresh patch
---
 debian/patches/0001-do-not-set-rpath.patch | 35 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/debian/patches/0001-do-not-set-rpath.patch b/debian/patches/0001-do-not-set-rpath.patch
index 79d9bea..e7f06e9 100644
--- a/debian/patches/0001-do-not-set-rpath.patch
+++ b/debian/patches/0001-do-not-set-rpath.patch
@@ -6,21 +6,20 @@ Subject: do not set rpath
  ext/extconf.rb | 7 -------
  1 file changed, 7 deletions(-)
 
-diff --git a/ext/extconf.rb b/ext/extconf.rb
-index fc2dcaf..ac38efd 100644
---- a/ext/extconf.rb
-+++ b/ext/extconf.rb
-@@ -32,13 +32,6 @@ if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_exe
- 	incdir = `"#{pgconfig}" --includedir`.chomp
- 	libdir = `"#{pgconfig}" --libdir`.chomp
- 	dir_config 'pg', incdir, libdir
--
--	# Try to use runtime path linker option, even if RbConfig doesn't know about it.
--	# The rpath option is usually set implicit by dir_config(), but so far not
--	# on MacOS-X.
--	if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
--		$LDFLAGS << " -Wl,-rpath,#{libdir}"
--	end
- else
- 	$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
- 		" --with-pg-config=/path/to/pg_config"
+Index: ruby-pg/ext/extconf.rb
+===================================================================
+--- ruby-pg.orig/ext/extconf.rb
++++ ruby-pg/ext/extconf.rb
+@@ -30,12 +30,6 @@ else
+ 		libdir = `"#{pgconfig}" --libdir`.chomp
+ 		dir_config 'pg', incdir, libdir
+ 
+-		# Try to use runtime path linker option, even if RbConfig doesn't know about it.
+-		# The rpath option is usually set implicit by dir_config(), but so far not
+-		# on MacOS-X.
+-		if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
+-			$LDFLAGS << " -Wl,-rpath,#{libdir}"
+-		end
+ 	else
+ 		$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
+ 			" --with-pg-config=/path/to/pg_config"

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