diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2009-04-28 05:33:37 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2009-04-28 05:33:37 +0000 |
| commit | 958bac636883ec671946342d8db6fa2eb568500c (patch) | |
| tree | 32c512ecf2fa5dbe13748281541b56758c989a45 /sci-libs/gdal | |
| parent | kvm-85 (diff) | |
| download | gentoo-2-958bac636883ec671946342d8db6fa2eb568500c.tar.gz gentoo-2-958bac636883ec671946342d8db6fa2eb568500c.tar.bz2 gentoo-2-958bac636883ec671946342d8db6fa2eb568500c.zip | |
Updated with missing patch for ruby makefile.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch | 34 |
2 files changed, 39 insertions, 1 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index 6630cbf095d4..f9af7c6417a5 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.57 2009/04/25 06:08:09 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.58 2009/04/28 05:33:37 nerdboy Exp $ + + 28 Apr 2009; Steve Arnold <nerdboy@gentoo.org> + +files/gdal-1.6.0-ruby-make.patch: + Updated with missing patch for ruby makefile. *gdal-1.6.0-r1 (25 Apr 2009) diff --git a/sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch b/sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch new file mode 100644 index 000000000000..f71db69b7067 --- /dev/null +++ b/sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch @@ -0,0 +1,34 @@ +--- 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 $< |