diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2016-10-07 08:25:10 +0000 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2016-10-07 08:25:10 +0000 |
commit | a482f2221d7469ac1fd7c7bc3b394d4eb4413abc (patch) | |
tree | 03bc411a8a0673d27c612d15293140cd918152de /storage/rocksdb/get_rocksdb_files.sh | |
parent | be33178833f1dbd4158c1ce3d8b6ce602afa644e (diff) | |
download | mariadb-git-a482f2221d7469ac1fd7c7bc3b394d4eb4413abc.tar.gz |
Fix MariaRocks build (unfinished)
Got to the point where we fail when compiling MyRocks files.
Diffstat (limited to 'storage/rocksdb/get_rocksdb_files.sh')
-rwxr-xr-x | storage/rocksdb/get_rocksdb_files.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/rocksdb/get_rocksdb_files.sh b/storage/rocksdb/get_rocksdb_files.sh index 121d664a086..bd5128a8609 100755 --- a/storage/rocksdb/get_rocksdb_files.sh +++ b/storage/rocksdb/get_rocksdb_files.sh @@ -2,20 +2,20 @@ MKFILE=`mktemp` # create and run a simple makefile # include rocksdb make file relative to the path of this script -echo "include rocksdb/src.mk +echo "include ./storage/rocksdb/rocksdb/src.mk all: @echo \$(LIB_SOURCES)" > $MKFILE for f in `make --makefile $MKFILE` do - echo ../../rocksdb/$f + echo ./rocksdb/$f done rm $MKFILE # create build_version.cc file. Only create one if it doesn't exists or if it is different # this is so that we don't rebuild mysqld every time -bv=rocksdb/util/build_version.cc +bv=storage/rocksdb/rocksdb/util/build_version.cc date=$(date +%F) -git_sha=$(pushd rocksdb >/dev/null && git rev-parse HEAD 2>/dev/null && popd >/dev/null) +git_sha=$(pushd storage/rocksdb/rocksdb >/dev/null && git rev-parse HEAD 2>/dev/null && popd >/dev/null) if [ ! -f $bv ] || [ -z $git_sha ] || [ ! `grep $git_sha $bv` ] then echo "#include \"build_version.h\" |