- updated to 1.11.0

[packages/gdal.git] / gdal-link.patch

diff --git a/gdal-link.patch b/gdal-link.patch
new file mode 100644 (file)
index 0000000..9a9f7e6
--- /dev/null
+++ b/gdal-link.patch
@@ -0,0 +1,29 @@
+--- gdal-1.11.0/swig/ruby/RubyMakefile.mk.orig 2014-05-11 22:02:00.429131553 +0200
++++ gdal-1.11.0/swig/ruby/RubyMakefile.mk      2014-05-12 19:26:05.824192351 +0200
+@@ -64,10 +64,10 @@
+       for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done
+ 
+ $(RUBY_MODULES_MAC): %.bundle: %_wrap.o
+-      $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
++      $(LD) $(LDFLAGS) $(GDAL_SLIB_LINK) $(LIBS) $(RUBY_LIB) $< -o $@
+ 
+ $(RUBY_MODULES_LIN): %.so: %_wrap.o
+-      $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
++      $(LD) $(LDFLAGS) $(GDAL_SLIB_LINK) $(LIBS) $(RUBY_LIB) $< -o $@
+ 
+ %.o: %.cpp
+       $(CXX) $(CFLAGS) -fPIC $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
+--- gdal-1.11.0/GDALmake.opt.in.orig   2014-04-16 22:04:49.000000000 +0200
++++ gdal-1.11.0/GDALmake.opt.in        2014-05-12 19:25:43.287526155 +0200
+@@ -100,7 +100,11 @@
+ 
+ GDAL_LIB      =       $(GDAL_ROOT)/libgdal.a
+ GDAL_SLIB     =       $(GDAL_ROOT)/libgdal.$(SO_EXT)
++ifeq ($(HAVE_LIBTOOL), yes)
++GDAL_SLIB_LINK        =       $(GDAL_ROOT)/libgdal.la
++else
+ GDAL_SLIB_LINK        =       -L$(GDAL_ROOT) -lgdal
++endif
+ 
+ # Mac OS X Framework definition
+ MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@