[DRE-commits] [ruby-libxml] 06/09: add 0200_do_not_overwrite_LDFLAGS.patch: do not overwrite system LDFLAGS

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-libxml.

commit 15e9c227179baea2ed2a65360a69847548cfde9c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Aug 20 12:05:32 2013 +0200

    add 0200_do_not_overwrite_LDFLAGS.patch: do not overwrite system LDFLAGS
---
 debian/patches/0200_do_not_overwrite_LDFLAGS.patch |   39 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/0200_do_not_overwrite_LDFLAGS.patch b/debian/patches/0200_do_not_overwrite_LDFLAGS.patch
new file mode 100644
index 0000000..964656b
--- /dev/null
+++ b/debian/patches/0200_do_not_overwrite_LDFLAGS.patch
@@ -0,0 +1,39 @@
+Description: do not overwrite system LDFLAGS
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Bug: https://github.com/xml4r/libxml-ruby/issues/74
+Last-Update: 2013-08-20
+
+--- a/ext/libxml/extconf.rb
++++ b/ext/libxml/extconf.rb
+@@ -4,19 +4,17 @@
+ 
+ require 'mkmf'
+ 
+-#if defined?(CFLAGS)
+-#  if CFLAGS.index(CONFIG['CCDLFLAGS'])
+-#    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
+-#  else
+-#    $CFLAGS = CFLAGS
+-#  end
+-#else
+-#  $CFLAGS = CONFIG['CFLAGS']
+-#end
+-#$LDFLAGS = CONFIG['LDFLAGS']
+-#$LDFLAGS = "-L/usr/local/lib"
+-#$LIBPATH.push(Config::CONFIG['libdir'])
+-$LDFLAGS = "-Lc:/mingw/local/lib"
++if defined?(CFLAGS)
++  if CFLAGS.index(CONFIG['CCDLFLAGS'])
++    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
++  else
++    $CFLAGS = CFLAGS
++  end
++else
++  $CFLAGS = CONFIG['CFLAGS']
++end
++$LDFLAGS = CONFIG['LDFLAGS']
++$LIBPATH.push(Config::CONFIG['libdir'])
+ 
+ def crash(str)
+   printf(" extconf failure: %s\n", str)
diff --git a/debian/patches/series b/debian/patches/series
index ef8107d..eb39b8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0100_run_builtin_shell_command_ulimit_in_tests.patch
 #fix_test_under_1.9.1
+0200_do_not_overwrite_LDFLAGS.patch

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