r2836 - packages/trunk/vegastrike/debian/patches

[Andres Mejia]

Author: ceros-guest
Date: 2007-06-05 01:57:35 +0000 (Tue, 05 Jun 2007)
New Revision: 2836

Modified:
   packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff
   packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff
Log:
Addressing bug #426872. Need to explicitly use either -lboost_python-st or -lboost_python-mt. Default was originally suppose to be -lboost_python-st.

Modified: packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff	2007-06-04 21:32:27 UTC (rev 2835)
+++ packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff	2007-06-05 01:57:35 UTC (rev 2836)
@@ -20,7 +20,7 @@
  gfx/nav/libnav.a					\
  aldrv/libaldrv.a 					\
 --lz
-+-lboost_python -lz
++-lboost_python-st -lz
  
  vegaserver_LDADD =  			\
  networking/netserver_devices.o	\
@@ -31,7 +31,7 @@
 -boost129/libboost_python.a      \
 -boost/libboost_python.a	        \
 --lz
-+-lboost_python -lz
++-lboost_python-st -lz
  
  accountserver_LDADD =           \
  networking/libnetacct.a 		\
@@ -54,7 +54,7 @@
 -   BOOST_LIBS="../src/boost129/libpython_boost.a"
 -fi
 +BOOST_CPPFLAGS="-DUSE_BOOST_131=1 "
-+BOOST_LIBS="-lpython_boost"
++BOOST_LIBS="-lboost_python-st"
  
  if test "$TESTUSEBOOST131" = "0" ; then
  TESTUSEBOOST128="1"

Modified: packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff	2007-06-04 21:32:27 UTC (rev 2835)
+++ packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff	2007-06-05 01:57:35 UTC (rev 2836)
@@ -19709,7 +19709,7 @@
 +
 +
 +BOOST_CPPFLAGS="-DUSE_BOOST_131=1 "
-+BOOST_LIBS="-lpython_boost"
++BOOST_LIBS="-lboost_python-st"
 +
 +if test "$TESTUSEBOOST131" = "0" ; then
 +TESTUSEBOOST128="1"
@@ -24733,7 +24733,7 @@
 +cmd/collide/libcollide.a 			\
 +gfx/nav/libnav.a					\
 +aldrv/libaldrv.a 					\
-+-lboost_python -lz
++-lboost_python-st -lz
 +
 +vegaserver_LDADD = \
 +networking/netserver_devices.o	\
@@ -24751,7 +24751,7 @@
 +gfx/libgfxserver.a 				\
 +gldrv/libgldrvserver.a 			\
 +cmd/collide/libcollide.a 		\
-+-lboost_python -lz
++-lboost_python-st -lz
 +
 +accountserver_LDADD = \
 +networking/libnetacct.a 		\