Package: zeroc-ice / 3.5.1-6

rubyarchhdrdir.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
Description: fix path for arch-specific Ruby headers
 ruby2.x is multiarched, and the location of arch-specific headers is
 referenced in RbConfig::CONFIG["rubyarchhdrdir"]
Author: Cédric Boutillier <boutil@debian.org>
Last-Update: 2014-04-26

--- a/rb/config/Make.rules
+++ b/rb/config/Make.rules
@@ -81,9 +82,12 @@
 
 	ifeq ("$(RUBY_MAJOR_VERSION).$(RUBY_MINOR_VERSION)", "1.8")
 		RUBY_FLAGS		= -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(archdir)")')
-	else
+	else ifeq ("$(RUBY_MAJOR_VERSION).$(RUBY_MINOR_VERSION)", "1.9")
 		RUBY_FLAGS		= -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyhdrdir)")') \
 							-I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyhdrdir)/$$(arch)")')
+	else
+		RUBY_FLAGS		= -I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyhdrdir)")') \
+							-I$(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(rubyarchhdrdir)")')
 	endif
 
 	LIB_DIR			= $(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$$(libdir)")')