Commit 2eb4de2e authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'remove_gflags' into 'master' 

Remove optional dependency `gflags`

Closes #59

See merge request zdvresearch_bsc/adafs!109
parents 99f5fd9f 16b5f274

docker/build_env.docker

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ RUN yum -y -q update && yum -y -q install \ 
	# RocksDB

	which \

	snappy-devel \

	gflags-devel \

	libzstd-devel \

	lz4-devel \

	bzip2-devel \
@@ -86,7 +85,6 @@ RUN yum -y -q update && yum -y -q install \ 
	# RocksDB

	which \

	snappy-devel \

	gflags-devel \

	libzstd-devel \

	lz4-devel \

	bzip2-devel \

ifs/README.md

+0 −13
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ This is a file system. 
### Debian/Ubuntu - Dependencies



- Upgrade your gcc to version at least 4.8 to get C++11 support.

- Install gflags. First, try: `sudo apt-get install libgflags-dev` If this doesn't work and you're using Ubuntu, here's

a nice tutorial: (http://askubuntu.com/questions/312173/installing-gflags-12-04)

- Install snappy. This is usually as easy as: `sudo apt-get install libsnappy-dev`

- Install zlib. Try: `sudo apt-get install zlib1g-dev`

- Install bzip2: `sudo apt-get install libbz2-dev`
@@ -18,17 +16,6 @@ a nice tutorial: (http://askubuntu.com/questions/312173/installing-gflags-12-04) 


### CentOS/Red Hat - Dependencies

- Upgrade your gcc to version at least 4.8 to get C++11 support: yum install gcc48-c++

- Install gflags:



```bash

    git clone https://github.com/gflags/gflags.git

    cd gflags

    git checkout v2.0

    ./configure && make && sudo make install

```

__Notice:__ Once installed, please add the include path for gflags to your CPATH environment variable and the lib path

to LIBRARY_PATH. If installed with default settings, the include path will be /usr/local/include and the lib path will

be /usr/local/lib.

- Install snappy:

    `sudo yum install snappy snappy-devel`

- Install zlib:

ifs/scripts/compile_dep.sh

+0 −8
Original line number Diff line number Diff line
@@ -171,14 +171,6 @@ if [[ ( "${CLUSTER}" == "mogon1" ) || ( "${CLUSTER}" == "fh2" ) || ( "${CLUSTER} 
    ../configure --prefix=${INSTALL}

    make -j${CORES}

    make install

    # compile gflags

    echo "############################################################ Installing:  gflags"

    CURR=${SOURCE}/gflags

    prepare_build_dir ${CURR}

    cd ${CURR}/build

    $CMAKE -DCMAKE_INSTALL_PREFIX=${INSTALL} -DCMAKE_BUILD_TYPE:STRING=Release ..

    make -j${CORES}

    make install

    # compile zstd

    echo "############################################################ Installing:  zstd"

    CURR=${SOURCE}/zstd/build/cmake

ifs/scripts/dl_dep.sh

+0 −2
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ mkdir -p ${SOURCE} 
if [[ ( "${CLUSTER}" == "mogon1" ) || ( "${CLUSTER}" == "mogon2" ) || ( "${CLUSTER}" == "fh2" ) ]]; then

    # get libtool for cci

    wgetdeps "libtool" "https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz" &

    # get gflags for rocksdb

    wgetdeps "gflags" "https://github.com/gflags/gflags/archive/v2.2.1.tar.gz" &

    # get zstd for fast compression in rocksdb

    wgetdeps "zstd" "https://github.com/facebook/zstd/archive/v1.3.2.tar.gz" &

    # get zlib for rocksdb