Changeset 502

Timestamp:

May 18, 2009, 2:22:48 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 397

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/fragments/library (modified) (1 diff)
• mgr/requirements (modified) (3 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2009-05-18    <rybkin@lal.in2p3.fr> 397
+        
+        * mgr/fragments/library: Pass all objects as arguments to macro ar to allow
+        the macro to be "libtool -o" for Darwin. Rebuild static library completely
+        whenever an object changes to be consistent on all systems
+        * mgr/requirements: For Darwin, build statically linked (archive) libraries
+        with "libtool", the recommended way. For Linux, use the system Python in
+        svn_checkout_command to ensure the Subversion Python bindings installed
+        on the system are used
+        
 2009-05-15    <rybkin@lal.in2p3.fr> 396
         

CMT/HEAD/mgr/fragments/library

@@ -6 +6 @@
 $(${CONSTITUENT}lib) :: ${OBJS}
         $(lib_echo) "static library $@"
-        $(lib_silent) $(ar) $(${CONSTITUENT}lib) $?
+        $(lib_silent) [ ! -f $@ ] || \rm -f $@
+        $(lib_silent) $(ar) $(${CONSTITUENT}lib) ${OBJS}
         $(lib_silent) $(ranlib) $(${CONSTITUENT}lib)
         $(lib_silent) cat /dev/null >$(${CONSTITUENT}stamp)

CMT/HEAD/mgr/requirements

@@ -360 +360 @@
       RIO806X         "ar clr" \
       Linux           "ar cr" \
+      Darwin          "libtool -static -o" \
       VisualC         "lib.exe /nologo "
 
@@ -368 +369 @@
       RIO806X         "ranlib" \
       LynxOS          "ar ts" \
-      IRIX            "ar ts"
+      IRIX            "ar ts" \
+      Darwin          ":"
 
 macro make_shlib    "echo" \
@@ -473 +475 @@
 
 macro svn_checkout_command "" \
-      Linux        "python ${CMTROOT}/mgr/cmt_svn_checkout.py " \
+      Linux        "/usr/bin/python ${CMTROOT}/mgr/cmt_svn_checkout.py " \
       Darwin       "python ${CMTROOT}/mgr/cmt_svn_checkout.py " \
       VisualC      "python %CMTROOT%\mgr\cmt_svn_checkout.py "