1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
|
## 30_system_flags.dpatch by Cédric Boutillier <boutil@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: do not overwrite system flags
## DP: - remove -Werror, since a warning is raised with newer gcc
## DP: - reuse system CFLAGS, CPPFLAGS, LDFLAGS to benefit from hardening
## DP: - add RbConfig::CONFIG["rubyarchhdrdir"] to cpppath
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' subtle-0.11.3224-xi~/Rakefile subtle-0.11.3224-xi/Rakefile
--- subtle-0.11.3224-xi~/Rakefile 2014-04-22 23:20:37.000000000 +0200
+++ subtle-0.11.3224-xi/Rakefile 2014-04-22 23:20:59.498375548 +0200
@@ -63,9 +63,9 @@
"hdrdir" => "",
"archdir" => "",
"revision" => "3224", #< Latest stable
- "cflags" => "-Wall -Werror -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
- "cpppath" => "-I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir)",
- "ldflags" => "-L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+ "cflags" => "$(CFLAGS) -Wall -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
+ "cpppath" => "$(CPPFLAGS) -I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir) -idirafter$(rubyarchhdrdir)",
+ "ldflags" => "$(LDFLAGS) -L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
"extflags" => "$(LDFLAGS) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
"rpath" => "-L$(libdir) -Wl,-rpath=$(libdir)",
"checksums" => []
|