[DRE-commits] [ruby-pg] 03/04: do not set rpath

[Dmitry Borodaenko]

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

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

commit 059a1c62feafc274416811655fd834dd41b58468
Author: Dmitry Borodaenko <angdraug at gmail.com>
Date:   Sat Aug 10 17:32:02 2013 -0700

    do not set rpath
---
 debian/patches/0001-do-not-set-rpath.patch |   26 ++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0001-do-not-set-rpath.patch b/debian/patches/0001-do-not-set-rpath.patch
new file mode 100644
index 0000000..79d9bea
--- /dev/null
+++ b/debian/patches/0001-do-not-set-rpath.patch
@@ -0,0 +1,26 @@
+From: Dmitry Borodaenko <angdraug at gmail.com>
+Date: Sat, 10 Aug 2013 17:24:26 -0700
+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"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..26018cd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-do-not-set-rpath.patch

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