summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2009-04-28 05:33:37 +0000
committerSteve Arnold <nerdboy@gentoo.org>2009-04-28 05:33:37 +0000
commitc229aba340b6ea0e047cecefa6403a68c36f6a4d (patch)
treed75065649e00da1c0b591631c348613010477cb0 /sci-libs/gdal
parentkvm-85 (diff)
downloadhistorical-c229aba340b6ea0e047cecefa6403a68c36f6a4d.tar.gz
historical-c229aba340b6ea0e047cecefa6403a68c36f6a4d.tar.bz2
historical-c229aba340b6ea0e047cecefa6403a68c36f6a4d.zip
Updated with missing patch for ruby makefile.
Package-Manager: portage-2.2_rc31/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/gdal')
-rw-r--r--sci-libs/gdal/ChangeLog6
-rw-r--r--sci-libs/gdal/Manifest3
-rw-r--r--sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch34
3 files changed, 41 insertions, 2 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/Manifest b/sci-libs/gdal/Manifest
index d177622dfb70..4c018e7360c7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -10,6 +10,7 @@ AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4
AUX gdal-1.5.1-max-min.patch 4292 RMD160 299c1ff45e3586986d5177ced76c29f9c3f94b3a SHA1 b355c50408351af34ce51f3232bb3e577d7ce513 SHA256 b3238774b3bde6b7cfa289084313eea5b82e71f3ea08c68f9c70ed7af465a3df
AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
AUX gdal-1.5.2-xerces-64-bit.patch 2002 RMD160 3e8386a5d4127881a299344c36f18e9848cafea7 SHA1 62b30b6a4e55dd46f1e985d445b6ace58d698f4f SHA256 419c2c4713ae72a617cbdb5433a69a7217bc99743e34e94430bbca8119b5c1cf
+AUX gdal-1.6.0-ruby-make.patch 1071 RMD160 ec020c5c22a397e248363232197358ea0e9eb6de SHA1 d7b5a568da01dd83f46fee897f8622db3b6b6db2 SHA256 4a027ce95da9ab870676e097239b83d40e87b199852590854bbe349b18c7ac4e
AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae
DIST gdal-1.3.1.tar.gz 6856011 RMD160 5967608e6e1c9f0af8698fcffb58eab4dcdd518d SHA1 2783c4c0d2a83a34f4c5c6a8efe41e816ba396fb SHA256 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753
@@ -28,5 +29,5 @@ EBUILD gdal-1.5.1.ebuild 6181 RMD160 fab38e35517ecb614fd06b25a01e6deb7f495cbd SH
EBUILD gdal-1.5.2.ebuild 6420 RMD160 8647e5beb496b3fca5e3616cb7839f749fc2f85a SHA1 ea96e14b1ddf131f075e9c06d61b3d2d98a831b9 SHA256 2e74fe78c00fb02cd61bcc484493f9ec069ad86676b7bca0dfe50f9c5c0164a4
EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
EBUILD gdal-1.6.0-r1.ebuild 6544 RMD160 5a1341a5c0458249dbd5f7ff5412776c7dfc6c00 SHA1 c21106d24615110821f9818e1aff86413a3f5aec SHA256 74af1e59daa5d0bd966df71adbff0fe7125f43401401c690d69fa0422ccf5556
-MISC ChangeLog 11448 RMD160 8ed3db4473742b09d563e7d476f074f82a5e3b24 SHA1 c1138e482286ef276e065f3663a976bee3a49c39 SHA256 4ce2501c5d322eea8dfb45faf517441c831145b403852d695f763b3746de9ce6
+MISC ChangeLog 11583 RMD160 828024c7e5971c059ff000c69b03609b871859bf SHA1 c3091e28c216a76f0b5d7254678666ac1e5c1478 SHA256 04e7603695be256863b64cc06b9f18fff6b6f669890efad0791e15eac6cb1b94
MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
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 $<