[gentoo-commits] gentoo-x86 commit in sci-libs/gdal/files: gdal-1.6.0-ruby-make.patch

[Steve Arnold (nerdboy)]

nerdboy     09/04/28 05:33:38

  Added:                gdal-1.6.0-ruby-make.patch
  Log:
  Updated with missing patch for ruby makefile.
  (Portage version: 2.2_rc31/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch?rev=1.1&content-type=text/plain

Index: gdal-1.6.0-ruby-make.patch
===================================================================
--- swig/ruby/RubyMakefile.mk.orig	2009-04-20 18:43:31.107342741 -0700
+++ swig/ruby/RubyMakefile.mk	2009-04-20 18:45:51.396591741 -0700
@@ -25,7 +25,9 @@
 INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
 
 RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
-LDFLAGS += -shared -L$(RUBY_LIB_DIR)
+LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
+CFLAGS += -fPIC -DPIC
+CXXFLAGS += -fPIC -DPIC
 RUBY_LIB := -l$(RUBY_SO_NAME)
 
 build: $(RUBY_MODULES)
@@ -41,17 +43,17 @@
 $(INSTALL_DIR):
 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
 
-install: $(INSTALL_DIR)
+install: $(INSTALL_DIR) $(RUBY_MODULES)
 	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
 
 $(RUBY_MODULES): %.so: %_wrap.o
 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
 
 %.o: %.cpp
-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
+	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
 
 %.o: %.cxx
-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
+	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(GDAL_INCLUDE)  $(RUBY_INCLUDE) -c $<