pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from tfzxyinhao/master 

update compile optional
pull/1/merge
YuQing 2015-08-26 18:38:51 +08:00
parent de1be00ccb 77bb1bf94e
commit c7c9d2a19f
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make.sh
View File

@ -5,7 +5,7 @@ cat <<EOF > $tmp_src_filename
#include <fcntl.h> #include <fcntl.h>
int main() int main()
{ {
printf("%d\n", (int)sizeof(long)); printf("%d\n", (int)sizeof(void*));
printf("%d\n", (int)sizeof(off_t)); printf("%d\n", (int)sizeof(off_t));
return 0; return 0;
} }
@ -23,6 +23,8 @@ fi
count=0 count=0
int_bytes=4 int_bytes=4
off_bytes=8 off_bytes=8
LIB_VERSION=lib64
for col in $output; do for col in $output; do
if [ $count -eq 0 ]; then if [ $count -eq 0 ]; then
int_bytes=$col int_bytes=$col
@ -36,8 +38,10 @@ done
/bin/rm -f a.out $tmp_src_filename /bin/rm -f a.out $tmp_src_filename
if [ "$int_bytes" -eq 8 ]; then if [ "$int_bytes" -eq 8 ]; then
OS_BITS=64 OS_BITS=64
LIB_VERSION=lib64
else else
OS_BITS=32 OS_BITS=32
LIB_VERSION=lib
fi fi
if [ "$off_bytes" -eq 8 ]; then if [ "$off_bytes" -eq 8 ]; then
@ -118,5 +122,6 @@ cd src
cp Makefile.in Makefile cp Makefile.in Makefile
perl -pi -e "s#\\\$\(CFLAGS\)#$CFLAGS#g" Makefile perl -pi -e "s#\\\$\(CFLAGS\)#$CFLAGS#g" Makefile
perl -pi -e "s#\\\$\(LIBS\)#$LIBS#g" Makefile perl -pi -e "s#\\\$\(LIBS\)#$LIBS#g" Makefile
make $1 $2 perl -pi -e "s#\\\$\(LIB_VERSION\)#$LIB_VERSION#g" Makefile
make $1 $2 $3

9
src/Makefile.in
View File

@ -3,6 +3,7 @@
COMPILE = $(CC) $(CFLAGS) COMPILE = $(CC) $(CFLAGS)
INC_PATH = INC_PATH =
LIB_PATH = $(LIBS) LIB_PATH = $(LIBS)
LIB_VERSION = $(LIB_VERSION)
FAST_SHARED_OBJS = hash.lo chain.lo shared_func.lo ini_file_reader.lo \ FAST_SHARED_OBJS = hash.lo chain.lo shared_func.lo ini_file_reader.lo \
logger.lo sockopt.lo base64.lo sched_thread.lo \ logger.lo sockopt.lo base64.lo sched_thread.lo \
@ -46,12 +47,12 @@ libfastcommon.a: $(FAST_STATIC_OBJS)
.c.lo: .c.lo:
$(COMPILE) -c -fPIC -o $@ $< $(INC_PATH) $(COMPILE) -c -fPIC -o $@ $< $(INC_PATH)
install: install:
mkdir -p $(DESTDIR)/usr/lib64 mkdir -p $(DESTDIR)/usr/$(LIB_VERSION)
install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/lib64 install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/$(LIB_VERSION)
mkdir -p $(DESTDIR)/usr/include/fastcommon mkdir -p $(DESTDIR)/usr/include/fastcommon
install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon
# cd $(DESTDIR)/usr/lib64 && ln -fs libfastcommon.so.1 libfastcommon.so # cd $(DESTDIR)/usr/$(LIB_VERSION) && ln -fs libfastcommon.so.1 libfastcommon.so
# ln -fs $(DESTDIR)/usr/local/lib/libfastcommon.so.1 $(DESTDIR)/usr/local/lib/libfastcommon.so # ln -fs $(DESTDIR)/usr/local/$(LIB_VERSION)/libfastcommon.so.1 $(DESTDIR)/usr/local/$(LIB_VERSION)/libfastcommon.so
# sh ./fast_link_library.sh # sh ./fast_link_library.sh
clean: clean:
rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)

2
src/pthread_func.c
View File

@ -38,7 +38,7 @@ int init_pthread_lock(pthread_mutex_t *pthread_lock)
return result; return result;
} }
if ((result=pthread_mutexattr_settype(&mat, \ if ((result=pthread_mutexattr_settype(&mat, \
PTHREAD_MUTEX_ERRORCHECK)) != 0) PTHREAD_MUTEX_ERRORCHECK_NP)) != 0)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, " \
"call pthread_mutexattr_settype fail, " \ "call pthread_mutexattr_settype fail, " \