You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.4 KiB
48 lines
1.4 KiB
11 years ago
|
diff -Naurw gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk gdal-1.10.0/swig/ruby/RubyMakefile.mk
|
||
|
--- gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk 2013-04-24 18:55:26.000000000 +0000
|
||
|
+++ gdal-1.10.0/swig/ruby/RubyMakefile.mk 2013-06-25 23:58:06.464518830 +0000
|
||
|
@@ -37,13 +37,13 @@
|
||
|
|
||
|
ifeq ("$(shell uname -s)", "Darwin")
|
||
|
RUBY_MODULES=$(RUBY_MODULES_MAC)
|
||
|
-LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
|
||
|
-RUBY_LIB := -l$(RUBY_SO_NAME)
|
||
|
else
|
||
|
RUBY_MODULES=$(RUBY_MODULES_LIN)
|
||
|
-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
|
||
|
-RUBY_LIB := -l$(RUBY_SO_NAME)
|
||
|
endif
|
||
|
+LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR)
|
||
|
+CFLAGS += -fPIC -DPIC
|
||
|
+CXXFLAGS += -fPIC -DPIC
|
||
|
+RUBY_LIB := -l$(RUBY_SO_NAME)
|
||
|
|
||
|
build: $(RUBY_MODULES)
|
||
|
|
||
|
@@ -56,10 +56,10 @@
|
||
|
veryclean: clean
|
||
|
rm -f *_wrap.cpp
|
||
|
|
||
|
-$(INSTALL_DIR):
|
||
|
+$(DESTDIR)$(INSTALL_DIR):
|
||
|
mkdir -p $(DESTDIR)$(INSTALL_DIR)
|
||
|
|
||
|
-install: $(INSTALL_DIR)
|
||
|
+install: $(DESTDIR)$(INSTALL_DIR) $(RUBY_MODULES)
|
||
|
for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done
|
||
|
|
||
|
$(RUBY_MODULES_MAC): %.bundle: %_wrap.o
|
||
|
@@ -69,10 +69,10 @@
|
||
|
$(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 $<
|