[or-cvs] r21721: {projects} We only want one copy of the library, no dereferencing symli (projects/chumby)

[Jacob Appelbaum]

Author: ioerror
Date: 2010-02-22 05:23:41 +0000 (Mon, 22 Feb 2010)
New Revision: 21721

Modified:
   projects/chumby/build.sh
Log:
We only want one copy of the library, no dereferencing symlinks

Modified: projects/chumby/build.sh
===================================================================
--- projects/chumby/build.sh	2010-02-22 04:59:38 UTC (rev 21720)
+++ projects/chumby/build.sh	2010-02-22 05:23:41 UTC (rev 21721)
@@ -80,8 +80,7 @@
             --with-zlib-dir=$TMP_DIR/zlib-$ZLIB_VER/;
 
 make
-echo "Tor done - did it work?";
-sleep 60;
+cd $TMP_DIR;
 
 # Now we'll build the mod
 echo "Copying the contents of $SRC_DIR to our build directory...";
@@ -90,8 +89,12 @@
 # Now we'll pack the following most current files into the build
 echo "Copying libevent into our build directory...";
 mkdir -p $BUILD_DIR/tor/libs/;
-cp -v $TMP_DIR/libevent-$LIBEVENT_VER/.libs/*.so $BUILD_DIR/tor/libs/;
-cp -v $TMP_DIR/libevent-$LIBEVENT_VER/.libs/*.so.* $BUILD_DIR/tor/libs/;
+cp --preserve=links --no-dereference -v \
+    $TMP_DIR/libevent-$LIBEVENT_VER/.libs/*.so \
+    $BUILD_DIR/tor/libs/;
+cp --preserve=links --no-dereference -v \
+    $TMP_DIR/libevent-$LIBEVENT_VER/.libs/*.so.* \
+    $BUILD_DIR/tor/libs/;
 echo "Stripping libevent to save space...";
 strip $BUILD_DIR/tor/libs/*;
 echo "Copying Tor into our build directory...";