Skip to content

Loading…

[build] fix bus error while execute make -jN (N>1) #747

Merged
merged 1 commit into from

2 participants

@Chilledheart
@lins05 lins05 merged commit 95626a1 into haiwen:master

1 check passed

Details continuous-integration/travis-ci The Travis CI build passed
@Chilledheart

Thanks for merge!

@Chilledheart Chilledheart deleted the Chilledheart:patch-1 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 24, 2014
  1. @Chilledheart
This page is out of date. Refresh to see the latest.
Showing with 19 additions and 13 deletions.
  1. +2 −0 .gitignore
  2. +3 −9 .travis.yml
  3. +14 −4 lib/Makefile.am
View
2 .gitignore
@@ -60,6 +60,8 @@ debian/seafile
debian/*.substvars
lib/searpc-marshal.h
lib/searpc-signature.h
+lib/rpc_table.stamp
+lib/rpc_table.tmp
lib/dir.c
lib/dirent.c
lib/seafile-object.h
View
12 .travis.yml
@@ -5,25 +5,19 @@ compiler:
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq valac uuid-dev libevent-dev libarchive-dev intltool re2c libjansson-dev
- - git clone --depth=50 --branch=release-2-11-3 https://bitbucket.org/tildeslash/libzdb.git deps/libzdb
- - git clone --depth=50 --branch=master git://github.com/haiwen/libsearpc.git deps/libsearpc
- - git clone --depth=50 --branch=master git://github.com/haiwen/ccnet.git deps/ccnet
+ - git clone --depth=1 --branch=release-2-11-3 https://bitbucket.org/tildeslash/libzdb.git deps/libzdb
+ - git clone --depth=1 --branch=master git://github.com/haiwen/libsearpc.git deps/libsearpc
+ - git clone --depth=1 --branch=master git://github.com/haiwen/ccnet.git deps/ccnet
- curl -L -o libevhtp.tar.gz https://github.com/ellzey/libevhtp/archive/1.2.9.tar.gz
- tar -xvf libevhtp.tar.gz -C deps
- cd deps/libevhtp-1.2.9 && cmake . && make -j8 && sudo make install && cd -
- cd deps/libzdb && ./bootstrap && ./configure --without-postgresql --without-mysql && make -j8 && sudo make install && cd -
- cd deps/libsearpc && ./autogen.sh && ./configure
- - cd demo && python ../lib/searpc-codegen.py rpc_table.py && cd -
- - cd tests && python ../lib/searpc-codegen.py rpc_table.py && cd -
- make -j8 && sudo make install && cd ../..
- cd deps/ccnet && ./autogen.sh && ./configure --enable-client --enable-server
- - cd lib && python `which searpc-codegen.py` ./rpc_table.py && cd -
- - cd lib && valac -C --pkg posix ccnetobj.vala && cd -
- make -j8 && sudo make install && cd ../..
- ./autogen.sh
script:
- - cd lib && python `which searpc-codegen.py` ./rpc_table.py && cd -
- - cd lib && valac -C --pkg posix repo.vala commit.vala dirent.vala dir.vala task.vala branch.vala crypt.vala webaccess.vala copy-task.vala && cd -
- ./configure --disable-fuse --enable-client --enable-server
- make -j8
notifications:
View
18 lib/Makefile.am
@@ -18,6 +18,8 @@ seafile_object_define = repo.vala commit.vala dirent.vala dir.vala \
seafile_object_gen = $(seafile_object_define:.vala=.c)
+valac_gen = ${seafile_object_gen} seafile-object.h
+
EXTRA_DIST = ${seafile_object_define} rpc_table.py $(pcfiles)
utils_headers = net.h rsa.h bloom-filter.h utils.h db.h
@@ -60,16 +62,24 @@ libseafile_common_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl -lcrypto @LIB_G
searpc_gen = searpc-signature.h searpc-marshal.h
-gensource: ${searpc_gen}
+gensource: ${searpc_gen} ${valac_gen}
-${searpc_gen}: $(top_srcdir)/lib/rpc_table.py
+rpc_table.stamp: ${top_srcdir}/lib/rpc_table.py
+ @rm -f rpc_table.tmp
+ @touch rpc_table.tmp
@echo "[libsearpc]: generating rpc header files"
- @PYTHON@ `which searpc-codegen.py` $(top_srcdir)/lib/rpc_table.py
+ @PYTHON@ `which searpc-codegen.py` ${top_srcdir}/lib/rpc_table.py
@echo "[libsearpc]: done"
+ @mv -f rpc_table.tmp $@
+
+${searpc_gen}: rpc_table.stamp
clean-local:
rm -f ${searpc_gen}
- rm -f $(top_srcdir)/lib/rpc_table.pyc
+ rm -f rpc_table.pyc
+ rm -f rpc_table.stamp
+ rm -f rpc_table.tmp
+ rm -f ${valac_gen}
install-data-local:
if MACOS
Something went wrong with that request. Please try again.