Author: frankie
Date: 2008-06-06 10:17:10 +0000 (Fri, 06 Jun 2008)
New Revision: 1595
Modified:
packages/mapserver/trunk/debian/changelog
packages/mapserver/trunk/debian/rules
Log:
Fixing #483400
Modified: packages/mapserver/trunk/debian/changelog
===================================================================
--- packages/mapserver/trunk/debian/changelog 2008-06-05 11:12:25 UTC (rev
1594)
+++ packages/mapserver/trunk/debian/changelog 2008-06-06 10:17:10 UTC (rev
1595)
@@ -1,3 +1,12 @@
+mapserver (5.0.2-3) unstable; urgency=low
+
+ * The setup.py script is not able to manage properly static libraries flavor
+ for AGG now used embedded in mapserver. The trick is explicitly linking by
+ manipulating the mapscriptvars file before running setup.py.
+ (closes: #483400)
+
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Fri, 06 Jun 2008 10:34:21
+0200
+
mapserver (5.0.2-2) unstable; urgency=low
* Added embedded AGG 2.4 for use with mapserver. This is a BSD-licensed
Modified: packages/mapserver/trunk/debian/rules
===================================================================
--- packages/mapserver/trunk/debian/rules 2008-06-05 11:12:25 UTC (rev
1594)
+++ packages/mapserver/trunk/debian/rules 2008-06-06 10:17:10 UTC (rev
1595)
@@ -122,8 +122,16 @@
&& $(MAKE) LD_RUN_PATH="" OPTIMIZE="-O2 -g -W -Wall"
# Build python
+ # This is a dirty hack to properly link agg static libraries using
setup.py
+ # It fixes
+ # 1. changes a bit mapscriptvars
+ sed -e 's/ -lagg/\/libagg.a/' -e 's/-L\([^
]*\.agg-2\.4\/lib\)\/libagg\.a\ -laggfontfreetype/\1\/libagg.a
\1\/libaggfontfreetype.a/' \
+ $(CURDIR)/mapscriptvars
>$(CURDIR)/mapscript/python/mapscriptvars
+ # 2. now changes setup.py to use the changed copy
+ sed -e 's/\("\)\.\.\/\.\.\/\(mapscriptvars"\)/\1\2/' \
+ $(CURDIR)/mapscript/python/setup.py
>$(CURDIR)/mapscript/python/setup-hack.py
cd $(CURDIR)/mapscript/python && \
- set -e; for python in $(PYVERS); do $$python setup.py build; done
+ set -e; for python in $(PYVERS); do $$python setup-hack.py build; done
# Build ruby
cd $(CURDIR)/mapscript/ruby && set -e ; \
@@ -154,11 +162,14 @@
-$(MAKE) mapscriptvars || touch mapscriptvars
-cd mapscript/perl && $(MAKE) distclean
-cd mapscript/python && \
- for python in $(PYVERS); do $$python setup.py clean; done
+ for python in $(PYVERS); do $$python setup-hack.py clean; done
-$(RM) -rf mapscript/python/build
-$(MAKE) distclean -C $(CURDIR)/mapscript/ruby
-$(RM) -rf $(CURDIR)/mapscript/ruby/mapscript_wrap.c
-$(RM) mapscriptvars
+ # Clean private python-mapscript hacks
+ -$(RM) mapscript/python/mapscriptvars
+ -$(RM) mapscript/python/setup-hack.py
-$(RM) mapscript/perl/mapscript.i \
mapscript/tcl/mapscript.i \
@@ -215,7 +226,7 @@
# Python mapscript
cd $(CURDIR)/mapscript/python && set -e ; \
for python in $(PYVERS); do \
- $$python setup.py install --root=$(CURDIR)/debian/python-mapscript
; \
+ $$python setup-hack.py install
--root=$(CURDIR)/debian/python-mapscript ; \
done
# Ruby mapscript
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
