[gentoo-commits] gentoo-x86 commit in sci-libs/gdal/files: 1.7.2-ruby_cflags.patch

[Tomas Chvatal (scarabeus)]

scarabeus    10/07/30 12:27:51

  Added:                1.7.2-ruby_cflags.patch
  Log:
  Version bump. Drop older. Grass support to be done.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/gdal/files/1.7.2-ruby_cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/files/1.7.2-ruby_cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/files/1.7.2-ruby_cflags.patch?rev=1.1&content-type=text/plain

Index: 1.7.2-ruby_cflags.patch
===================================================================
--- swig/ruby/RubyMakefile.mk.orig	2010-07-27 16:55:52.061254647 +0200
+++ swig/ruby/RubyMakefile.mk	2010-07-27 16:57:06.837255416 +0200
@@ -25,7 +25,9 @@
 INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
 
 RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
-LDFLAGS += -Xcompiler -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)
@@ -40,17 +42,17 @@
 $(INSTALL_DIR):
 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
 
-install: $(INSTALL_DIR)
-	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
+install: $(INSTALL_DIR) $(RUBY_MODULES)
+	for f in $(RUBY_MODULES) ; do $(INSTALL) $$f $(DESTDIR)$(INSTALL_DIR) ; done
 
 $(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 $<