2015-02-03 12:24:59 +00:00
|
|
|
Description: Fix libtool in order to avoid a FTBFS.
|
|
|
|
|
RUBY_EXTENSION_DIR fix by Christian Hofstaedtler <zeha@debian.org>.
|
|
|
|
|
Author: Francesco Paolo Lovergine <frankie@debian.org>
|
|
|
|
|
Bug-Debian: https://bugs.debian.org/735652
|
|
|
|
|
--- a/swig/ruby/Makefile.am
|
|
|
|
|
+++ b/swig/ruby/Makefile.am
|
2015-11-08 14:59:10 +00:00
|
|
|
@@ -22,7 +22,7 @@
|
2015-02-03 12:24:59 +00:00
|
|
|
# Build Ruby module as shared library
|
|
|
|
|
rubyextensiondir_LTLIBRARIES = geos.la
|
|
|
|
|
geos_la_SOURCES = geos_wrap.cxx
|
2015-11-08 14:59:10 +00:00
|
|
|
-geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(RUBY_SO_NAME)
|
2015-02-03 12:24:59 +00:00
|
|
|
+geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
|
|
|
|
|
|
|
|
|
|
# Only need to grab the capi header files
|
2015-11-08 14:59:10 +00:00
|
|
|
geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
|
2015-02-03 12:24:59 +00:00
|
|
|
--- a/swig/ruby/Makefile.in
|
|
|
|
|
+++ b/swig/ruby/Makefile.in
|
2015-11-08 14:59:10 +00:00
|
|
|
@@ -451,7 +451,7 @@
|
2015-02-03 12:24:59 +00:00
|
|
|
# Build Ruby module as shared library
|
|
|
|
|
@ENABLE_RUBY_TRUE@rubyextensiondir_LTLIBRARIES = geos.la
|
|
|
|
|
@ENABLE_RUBY_TRUE@geos_la_SOURCES = geos_wrap.cxx
|
2015-11-08 14:59:10 +00:00
|
|
|
-@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(RUBY_SO_NAME)
|
2015-02-03 12:24:59 +00:00
|
|
|
+@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
|
|
|
|
|
|
|
|
|
|
# Only need to grab the capi header files
|
2015-11-08 14:59:10 +00:00
|
|
|
@ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
|
2015-02-03 12:24:59 +00:00
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
2015-11-08 14:59:10 +00:00
|
|
|
@@ -18564,7 +18564,7 @@
|
2015-02-03 12:24:59 +00:00
|
|
|
|
|
|
|
|
RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["libdir"] || Config::CONFIG["libdir"]'`
|
|
|
|
|
|
|
|
|
|
- RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"] || Config::CONFIG["sitearchdir"]'`
|
|
|
|
|
+ RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"] || Config::CONFIG["vendorarchdir"]'`
|
|
|
|
|
|
2015-11-08 14:59:10 +00:00
|
|
|
RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["RUBY_SO_NAME"] || Config::CONFIG["RUBY_SO_NAME"]'`
|
2015-02-03 12:24:59 +00:00
|
|
|
|
|
|
|
|
--- a/macros/ruby.m4
|
|
|
|
|
+++ b/macros/ruby.m4
|
2015-11-08 14:59:10 +00:00
|
|
|
@@ -35,7 +35,7 @@
|
2015-02-03 12:24:59 +00:00
|
|
|
RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["libdir"]] || Config::CONFIG[["libdir"]]'`
|
|
|
|
|
|
|
|
|
|
dnl Get Ruby extensions directory
|
|
|
|
|
- RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'`
|
|
|
|
|
+ RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["vendorarchdir"]] || Config::CONFIG[["vendorarchdir"]]'`
|
|
|
|
|
|
|
|
|
|
dnl Get Ruby shared library name, this does not include the lib prefix or extension name
|
2015-11-08 14:59:10 +00:00
|
|
|
RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
|
