Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Land b_head_libcfs onto HEAD (20080805_1611)
[fs/lustre-release.git]
/
lustre
/
liblustre
/
genlib.sh
diff --git
a/lustre/liblustre/genlib.sh
b/lustre/liblustre/genlib.sh
index
8635478
..
406c235
100755
(executable)
--- a/
lustre/liblustre/genlib.sh
+++ b/
lustre/liblustre/genlib.sh
@@
-24,6
+24,7
@@
LND_LIBS=$3
PTHREAD_LIBS=$4
QUOTA_LIBS=$5
CAP_LIBS=$6
PTHREAD_LIBS=$4
QUOTA_LIBS=$5
CAP_LIBS=$6
+ZLIB=$7
if [ ! -f $SYSIO/lib/libsysio.a ]; then
echo "ERROR: $SYSIO/lib/libsysio.a dosen't exist"
if [ ! -f $SYSIO/lib/libsysio.a ]; then
echo "ERROR: $SYSIO/lib/libsysio.a dosen't exist"
@@
-74,7
+75,8
@@
build_obj_list ../lvfs liblvfs.a
# lnet components libs
build_obj_list ../../lnet/utils libuptlctl.a
# lnet components libs
build_obj_list ../../lnet/utils libuptlctl.a
-build_obj_list ../../lnet/libcfs libcfs.a
+build_obj_list ../../libcfs/libcfs libcfs.a
+build_obj_list ../../libcfs/libcfs libcfsutil.a
if $(echo "$LND_LIBS" | grep "socklnd" >/dev/null) ; then
build_obj_list ../../lnet/ulnds/socklnd libsocklnd.a
fi
if $(echo "$LND_LIBS" | grep "socklnd" >/dev/null) ; then
build_obj_list ../../lnet/ulnds/socklnd libsocklnd.a
fi
@@
-108,7
+110,7
@@
OS=`uname`
if test x$OS = xAIX; then
$LD -shared -o $CWD/liblustre.so $ALL_OBJS -lpthread -Xlinker -bnoipath ../../libsyscall.so
else
if test x$OS = xAIX; then
$LD -shared -o $CWD/liblustre.so $ALL_OBJS -lpthread -Xlinker -bnoipath ../../libsyscall.so
else
-$LD -shared -
o $CWD/liblustre.so $ALL_OBJS $CAP_LIBS $PTHREAD_LIBS
+$LD -shared -
nostdlib -o $CWD/liblustre.so $ALL_OBJS $CAP_LIBS $PTHREAD_LIBS $ZLIB
fi
rm -rf $sysio_tmp
fi
rm -rf $sysio_tmp