Fix static build to use my hbb fork

Author: kdm9

src/Makefile.static

@@ -1,15 +1,9 @@
-GPGKEY 		= "E56C E72C 8060 C9F9 5F6B  5E72 0FEB 966A 205B 4780"
-HBB_DOCKER 	= docker run -t -i --rm -v $(shell pwd):/io \
-			  		phusion/holy-build-box-64:latest bash
-
-DEP_TARS_	= yaml-cpp.tar.gz boost.tar.bz2 libbz2.tar.gz
-DEP_TARS 	= $(foreach dep,$(DEP_TARS_),deps/$(dep))
-
-VERSION		= $(shell git describe)
-PREFIXDIR	= ./libqcpp_$(VERSION)_amd64
-QCPP_TARS	= trimit_$(VERSION)_amd64.tar.gz libqcpp_$(VERSION)_amd64.tar.gz
+HBB_DOCKER 	 = docker run -t -i --rm -v $(shell pwd):/io kdmurray91/kdm-hbb-64:latest bash
+VERSION      = $(shell git describe --match '[[:digit:]]*')
+PREFIXDIR    = ./libqcpp_$(VERSION)_amd64
+QCPP_TARS    = trimit_$(VERSION)_amd64.tar.gz libqcpp_$(VERSION)_amd64.tar.gz
 QCPP_TARSUMS = $(foreach tar,$(QCPP_TARS),$(tar).sha512sums)
-QCPP_SIGS   = $(foreach tar,$(QCPP_TARS),$(tar).asc)
+QCPP_SIGS    = $(foreach tar,$(QCPP_TARS),$(tar).asc)
 
 .PHONY: all clean cleandep sign
 all: $(QCPP_TARS) $(QCPP_TARSUMS)
@@ -20,37 +14,17 @@ clean:
 	rm -rf libqcpp_*_amd64 trimit_*_amd64
 	rm -f libqcpp_*_amd64.tar* trimit_*_amd64.tar*
 
-cleandep:
-	rm -rf deps
-
-libqcpp_$(VERSION)_amd64: src/hbb-build.sh $(DEP_TARS) .git/index
+libqcpp_$(VERSION)_amd64: src/hbb-build.sh .git/refs/tags
 	$(HBB_DOCKER) /io/$< $(VERSION)
-
-
+	mv static_build $@
 
 %.sha512sums: %
 	sha512sum $< >$@
 
-%.asc: %
-	gpg --armour --local-user $(GPGKEY) --detach-sign $<
-
-
 trimit_$(VERSION)_amd64.tar.gz: libqcpp_$(VERSION)_amd64
 	mkdir -p trimit_$(VERSION)_amd64
 	cp -r libqcpp_$(VERSION)_amd64/bin trimit_$(VERSION)_amd64/bin
 	tar czf $@ trimit_$(VERSION)_amd64
 
 libqcpp_$(VERSION)_amd64.tar.gz: libqcpp_$(VERSION)_amd64
 	tar czf $@ --exclude=bin libqcpp_$(VERSION)_amd64
-
-deps/yaml-cpp.tar.gz:
-	mkdir -p deps
-	wget -O $@ https://github.com/jbeder/yaml-cpp/archive/master.tar.gz
-
-deps/boost.tar.bz2:
-	mkdir -p deps
-	wget -O $@ http://downloads.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2
-
-deps/libbz2.tar.gz:
-	mkdir -p deps
-	wget -O $@ http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz

src/hbb-build.sh

@@ -2,55 +2,60 @@
 # SETUP #
 #########
 set -e
-source /hbb_exe_gc_hardened/activate
+source /hbb_exe/activate
 set -x
 
-export QCPP_VER=$1
+QCPP_VERSION=$1
+
+YAMLCPP_VER=0.5.3
 
 cd $(mktemp -d)
+export  CMAKE_PREFIX_PATH=/hbb_exe
 
 ########
 # DEPS #
 ########
 
-# Install libbz2
-tar xf /io/deps/libbz2.tar*
-pushd bzip2*/
-make CFLAGS=-fPIC
-make install
-popd
-rm -rf boost*/
-
-# Install boost headers only
-tar xf /io/deps/boost.tar* boost_1_60_0/boost/
-mv boost_1_*/boost /usr/local/include
-rm -rf boost*/
-
 # Compile & install yaml-cpp 
-tar xf /io/deps/yaml-cpp.tar*
+curl -LSO https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${YAMLCPP_VER}.tar.gz
+tar xf yaml-cpp*.tar.gz
 pushd yaml-cpp*/
 mkdir build && cd build
-cmake .. -DYAML_CPP_BUILD_TOOLS=Off -DYAML_CPP_BUILD_CONTRIB=Off
+cmake ..                       \
+    -DYAML_CPP_BUILD_TOOLS=Off \
+    -DYAML_CPP_BUILD_CONTRIB=Off
 make -j4
 make install
 popd
-rm -rf yaml-cpp*/
+rm -rf yaml-cpp*
 
+yum install -y git
 
 #########
 # BUILD #
 #########
 
-prefix=/io/libqcpp_${QCPP_VER}_amd64
+
+prefix=/io/static_build
+rm -rf $prefix
 mkdir -p $prefix
+chown 1000:1000 -R $prefix
 
+# Clone to builddir
 builddir=$(mktemp -d)
+git clone /io $builddir
 pushd $builddir
+git reset --hard HEAD
 
-cmake /io -DCMAKE_INSTALL_PREFIX=$prefix
-make -j4
+mkdir build
+cd build
+
+cmake $builddir                    \
+    -DCMAKE_INSTALL_PREFIX=$prefix \
+    -DSTATIC_BINARIES=On           \
+    -DQCPP_VERSION=$QCPP_VERSION
+make -j4 VERBOSE=1
 make test
 make install
-popd
 
 chown 1000:1000 -R $prefix