Author: frankie
Date: 2007-11-16 10:13:19 +0000 (Fri, 16 Nov 2007)
New Revision: 1274
Modified:
packages/gdal/trunk/debian/changelog
packages/gdal/trunk/debian/patches/rubymakefile.dpatch
packages/gdal/trunk/debian/patches/swig.dpatch
Log:
Fixing #450882
Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog 2007-11-14 17:07:20 UTC (rev
1273)
+++ packages/gdal/trunk/debian/changelog 2007-11-16 10:13:19 UTC (rev
1274)
@@ -3,9 +3,12 @@
* New upstream release.
This is a bug fixing release without API changes, so retaining current
naming scheme as for previous 1.4 series releases.
- * Patchset revised.
+ * Uses PIC building in Ruby bindings and properly fails in case of
+ building problems to avoid creating empty packages. Changed
rubymakefile.dpatch
+ for that.
+ (closes: #450882)
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Mon, 05 Nov 2007 14:47:08
+0100
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Thu, 15 Nov 2007 17:19:50
+0100
gdal (1.4.2-3) unstable; urgency=low
Modified: packages/gdal/trunk/debian/patches/rubymakefile.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/rubymakefile.dpatch 2007-11-14
17:07:20 UTC (rev 1273)
+++ packages/gdal/trunk/debian/patches/rubymakefile.dpatch 2007-11-16
10:13:19 UTC (rev 1274)
@@ -5,10 +5,21 @@
## DP: No description.
@DPATCH@
-diff -urNad gdal-1.4.2~/swig/ruby/RubyMakefile.mk
gdal-1.4.2/swig/ruby/RubyMakefile.mk
---- gdal-1.4.2~/swig/ruby/RubyMakefile.mk 2007-10-05 17:18:36.000000000
+0200
-+++ gdal-1.4.2/swig/ruby/RubyMakefile.mk 2007-10-16 12:16:07.000000000
+0200
-@@ -41,7 +41,7 @@
+diff -urNad gdal-1.4.3~/swig/ruby/RubyMakefile.mk
gdal-1.4.3/swig/ruby/RubyMakefile.mk
+--- gdal-1.4.3~/swig/ruby/RubyMakefile.mk 2007-11-15 18:06:32.000000000
+0100
++++ gdal-1.4.3/swig/ruby/RubyMakefile.mk 2007-11-16 10:52:00.000000000
+0100
+@@ -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 -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)
@@ -17,3 +28,15 @@
$(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 $<
Modified: packages/gdal/trunk/debian/patches/swig.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/swig.dpatch 2007-11-14 17:07:20 UTC
(rev 1273)
+++ packages/gdal/trunk/debian/patches/swig.dpatch 2007-11-16 10:13:19 UTC
(rev 1274)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad gdal-1.4.3~/pymod/GNUmakefile gdal-1.4.3/pymod/GNUmakefile
---- gdal-1.4.3~/pymod/GNUmakefile 2007-11-05 14:42:43.000000000 +0100
-+++ gdal-1.4.3/pymod/GNUmakefile 2007-11-05 14:43:55.000000000 +0100
+--- gdal-1.4.3~/pymod/GNUmakefile 2007-11-15 16:59:03.000000000 +0100
++++ gdal-1.4.3/pymod/GNUmakefile 2007-11-15 17:19:14.000000000 +0100
@@ -27,7 +27,7 @@
$(RM) *.o *.$(SO_EXT) *.la
@@ -17,3 +17,20 @@
$(GDALMODULE_SO): $(OBJ) $(EXE_DEP_LIBS)
$(PY_LD_SHARED) $(OBJ) \
+diff -urNad gdal-1.4.3~/swig/GNUmakefile gdal-1.4.3/swig/GNUmakefile
+--- gdal-1.4.3~/swig/GNUmakefile 2006-03-24 17:51:58.000000000 +0100
++++ gdal-1.4.3/swig/GNUmakefile 2007-11-15 17:19:34.000000000 +0100
+@@ -23,10 +23,10 @@
+ for dir in ${ALL_BINDINGS}; do (cd $$dir; make veryclean ); done
+
+ generate:
+- for dir in ${ALL_BINDINGS}; do (cd $$dir; make generate ); done
++ for dir in ${ALL_BINDINGS}; do (cd $$dir; make generate ) || exit; done
+
+ build:
+- for dir in ${BINDINGS}; do (cd $$dir; make build ); done
++ for dir in ${BINDINGS}; do (cd $$dir; make build ) || exit; done
+
+ install:
+- for dir in ${BINDINGS}; do (cd $$dir; make install ); done
++ for dir in ${BINDINGS}; do (cd $$dir; make install ) || exit; done
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
