| 1 |
titanofold 14/01/27 00:10:33 |
| 2 |
|
| 3 |
Added: gdal-1.10.0-ruby-makefile.patch |
| 4 |
Log: |
| 5 |
Fix bug 493236: Depend on Perl conditionally. Thanks Nikoli. |
| 6 |
Fix bug 492338: Version bump. Thanks Stephan Litterst. |
| 7 |
Fix bug 483074: Convert to python-r1 to support multiple Pythons. Thanks |
| 8 |
Ian Stakenvicius. |
| 9 |
Fix bug 466114: Append -lisqlite3 to LIBS. Thanks cmuelle8. |
| 10 |
Fix bug 482888: Modify poppler dependency to have a minimum |
| 11 |
version (>=0.24.3). |
| 12 |
Fix bug 490048: Add dev-libs/libpcre and dev-libs/libxml2 to RDEPEND |
| 13 |
Fix bug 489224: Add sub-slot operator to trigger rebuild when poppler or |
| 14 |
Perl is updated. Thanks Nikoli. |
| 15 |
Fix bug 490046: Resolved by sci-libs/gdal version bump. |
| 16 |
Fix bug 474678: Really include the patch this time. |
| 17 |
|
| 18 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0) |
| 19 |
|
| 20 |
Revision Changes Path |
| 21 |
1.1 sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch |
| 22 |
|
| 23 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch?rev=1.1&view=markup |
| 24 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch?rev=1.1&content-type=text/plain |
| 25 |
|
| 26 |
Index: gdal-1.10.0-ruby-makefile.patch |
| 27 |
=================================================================== |
| 28 |
diff -Naurw gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk gdal-1.10.0/swig/ruby/RubyMakefile.mk |
| 29 |
--- gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk 2013-04-24 18:55:26.000000000 +0000 |
| 30 |
+++ gdal-1.10.0/swig/ruby/RubyMakefile.mk 2013-06-25 23:58:06.464518830 +0000 |
| 31 |
@@ -37,13 +37,13 @@ |
| 32 |
|
| 33 |
ifeq ("$(shell uname -s)", "Darwin") |
| 34 |
RUBY_MODULES=$(RUBY_MODULES_MAC) |
| 35 |
-LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR) |
| 36 |
-RUBY_LIB := -l$(RUBY_SO_NAME) |
| 37 |
else |
| 38 |
RUBY_MODULES=$(RUBY_MODULES_LIN) |
| 39 |
-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR) |
| 40 |
-RUBY_LIB := -l$(RUBY_SO_NAME) |
| 41 |
endif |
| 42 |
+LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR) |
| 43 |
+CFLAGS += -fPIC -DPIC |
| 44 |
+CXXFLAGS += -fPIC -DPIC |
| 45 |
+RUBY_LIB := -l$(RUBY_SO_NAME) |
| 46 |
|
| 47 |
build: $(RUBY_MODULES) |
| 48 |
|
| 49 |
@@ -56,10 +56,10 @@ |
| 50 |
veryclean: clean |
| 51 |
rm -f *_wrap.cpp |
| 52 |
|
| 53 |
-$(INSTALL_DIR): |
| 54 |
+$(DESTDIR)$(INSTALL_DIR): |
| 55 |
mkdir -p $(DESTDIR)$(INSTALL_DIR) |
| 56 |
|
| 57 |
-install: $(INSTALL_DIR) |
| 58 |
+install: $(DESTDIR)$(INSTALL_DIR) $(RUBY_MODULES) |
| 59 |
for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done |
| 60 |
|
| 61 |
$(RUBY_MODULES_MAC): %.bundle: %_wrap.o |
| 62 |
@@ -69,10 +69,10 @@ |
| 63 |
$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ |
| 64 |
|
| 65 |
%.o: %.cpp |
| 66 |
- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< |
| 67 |
+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< |
| 68 |
|
| 69 |
%.o: %.cxx |
| 70 |
- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< |
| 71 |
+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< |
| 72 |
|
| 73 |
%.o: %.c |
| 74 |
$(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< |
Archives