openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File libruby.patch of Package geos (Revision 91e24bcc30f67d4e84fb1043703ab8fd)

Currently displaying revision 91e24bcc30f67d4e84fb1043703ab8fd , Show latest

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
Index: geos-3.6.1/swig/ruby/Makefile.am
===================================================================
--- geos-3.6.1.orig/swig/ruby/Makefile.am
+++ geos-3.6.1/swig/ruby/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS = -I$(RUBY_INCLUDE_DIR) -I$(
 # Build Ruby module as shared library
 rubyextensiondir_LTLIBRARIES = geos.la
 geos_la_SOURCES = geos_wrap.cxx
-geos_la_LIBADD =  $(top_builddir)/capi/libgeos_c.la $(RUBY_SO_NAME)
+geos_la_LIBADD =  $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
 
 # Only need to grab the capi header files
 geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
Index: geos-3.6.1/swig/ruby/Makefile.in
===================================================================
--- geos-3.6.1.orig/swig/ruby/Makefile.in
+++ geos-3.6.1/swig/ruby/Makefile.in
@@ -449,7 +449,7 @@ MAINTAINERCLEANFILES = geos_wrap.cxx
 # Build Ruby module as shared library
 @ENABLE_RUBY_TRUE@rubyextensiondir_LTLIBRARIES = geos.la
 @ENABLE_RUBY_TRUE@geos_la_SOURCES = geos_wrap.cxx
-@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(RUBY_SO_NAME)
+@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
 @ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
Index: geos-3.6.1/configure
===================================================================
--- geos-3.6.1.orig/configure
+++ geos-3.6.1/configure
@@ -18581,7 +18581,7 @@ fi
 
 				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"]'`
 
 				RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["RUBY_SO_NAME"] || Config::CONFIG["RUBY_SO_NAME"]'`
 
Index: geos-3.6.1/macros/ruby.m4
===================================================================
--- geos-3.6.1.orig/macros/ruby.m4
+++ geos-3.6.1/macros/ruby.m4
@@ -35,7 +35,7 @@ AC_DEFUN([AC_RUBY_DEVEL],
 		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
 		RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`

Places

File libruby.patch of Package geos (Revision 91e24bcc30f67d4e84fb1043703ab8fd)

Places