[Xorp-cvs] SF.net SVN: xorp:[11565] trunk/xorp

[bms_fbsd at users.sourceforge.net]

Revision: 11565
          http://xorp.svn.sourceforge.net/xorp/?rev=11565&view=rev
Author:   bms_fbsd
Date:     2009-10-02 11:54:15 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
Use PrependUnique(), not AppendUnique(), when building up the linker
search paths (LIBPATH) in the SConscripts.

This was a source of linkage problems with identically named libraries
in the system library locations being pulled in.

Submitted by:	karl at sipxx dot com

Modified Paths:
--------------
    trunk/xorp/cli/SConscript
    trunk/xorp/fib2mrib/SConscript
    trunk/xorp/libcomm/SConscript
    trunk/xorp/libproto/SConscript
    trunk/xorp/libxipc/SConscript
    trunk/xorp/mld6igmp/SConscript
    trunk/xorp/ospf/SConscript
    trunk/xorp/pim/SConscript
    trunk/xorp/policy/SConscript
    trunk/xorp/rib/SConscript
    trunk/xorp/rtrmgr/SConscript
    trunk/xorp/static_routes/SConscript
    trunk/xorp/vrrp/SConscript

Modified: trunk/xorp/cli/SConscript
===================================================================
--- trunk/xorp/cli/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/cli/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -36,7 +36,7 @@
     '$BUILDDIR',
      ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '$BUILDDIR/xrl/interfaces',
     '$BUILDDIR/xrl/targets',
     '$BUILDDIR/libxipc',

Modified: trunk/xorp/fib2mrib/SConscript
===================================================================
--- trunk/xorp/fib2mrib/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/fib2mrib/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -29,7 +29,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '../libxorp',
     '../libcomm',
     '../libxipc',

Modified: trunk/xorp/libcomm/SConscript
===================================================================
--- trunk/xorp/libcomm/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/libcomm/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -28,7 +28,7 @@
 is_shared = env.has_key('SHAREDLIBS')
 
 env.AppendUnique(CPPPATH = [ "#" ])
-env.AppendUnique(LIBPATH = [ '$BUILDDIR/libxorp' ] )
+env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp' ] )
 env.AppendUnique(LIBS = ['libxorp'])
 
 sources = [

Modified: trunk/xorp/libproto/SConscript
===================================================================
--- trunk/xorp/libproto/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/libproto/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -27,7 +27,7 @@
 is_shared = env.has_key('SHAREDLIBS')
 
 env.AppendUnique(CPPPATH = [ "#" ])
-env.AppendUnique(LIBPATH = [ '$BUILDDIR/libxorp'] )
+env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp'] )
 env.AppendUnique(LIBS = ['libxorp', 'crypto'])
 
 sources = [

Modified: trunk/xorp/libxipc/SConscript
===================================================================
--- trunk/xorp/libxipc/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/libxipc/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -36,7 +36,7 @@
     "$BUILDDIR",
     ])
 
-libxipc_env.AppendUnique(LIBPATH = [
+libxipc_env.PrependUnique(LIBPATH = [
     '$BUILDDIR/libcomm',
     '$BUILDDIR/libxorp'
     ])

Modified: trunk/xorp/mld6igmp/SConscript
===================================================================
--- trunk/xorp/mld6igmp/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/mld6igmp/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -28,7 +28,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '../libxorp',
     '../libcomm',
     '../libxipc',

Modified: trunk/xorp/ospf/SConscript
===================================================================
--- trunk/xorp/ospf/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/ospf/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -35,7 +35,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '../libxorp',
     '../libcomm',
     '../libxipc',

Modified: trunk/xorp/pim/SConscript
===================================================================
--- trunk/xorp/pim/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/pim/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -29,7 +29,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '../libxorp',
     '../libcomm',
     '../libxipc',

Modified: trunk/xorp/policy/SConscript
===================================================================
--- trunk/xorp/policy/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/policy/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -34,7 +34,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '$BUILDDIR/libfeaclient',
     '$BUILDDIR/policy/backend',
     '$BUILDDIR/policy/common',

Modified: trunk/xorp/rib/SConscript
===================================================================
--- trunk/xorp/rib/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/rib/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -36,7 +36,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '../libxorp',
     '../libcomm',
     '../libxipc',

Modified: trunk/xorp/rtrmgr/SConscript
===================================================================
--- trunk/xorp/rtrmgr/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/rtrmgr/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -34,7 +34,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '$BUILDDIR/libxorp',
     '$BUILDDIR/libcomm',
     '$BUILDDIR/libxipc',

Modified: trunk/xorp/static_routes/SConscript
===================================================================
--- trunk/xorp/static_routes/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/static_routes/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -29,7 +29,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '../libxorp',
     '../libcomm',
     '../libxipc',

Modified: trunk/xorp/vrrp/SConscript
===================================================================
--- trunk/xorp/vrrp/SConscript	2009-10-02 11:34:14 UTC (rev 11564)
+++ trunk/xorp/vrrp/SConscript	2009-10-02 11:54:15 UTC (rev 11565)
@@ -34,7 +34,7 @@
     '$BUILDDIR',
     ])
 
-env.AppendUnique(LIBPATH = [
+env.PrependUnique(LIBPATH = [
     '../libxorp',
     '../libcomm',
     '../libxipc',


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.