ARM support #23

Author: rafie

Dockerfile

@@ -14,8 +14,8 @@ WORKDIR /build
 
 RUN ./deps/readies/bin/getpy2
 RUN ./system-setup.py
-RUN make deps
-RUN make -j$(eval "$X_NPROC")
+RUN make deps SHOW=1
+RUN make build SHOW=1
 
 #----------------------------------------------------------------------------------------------
 # FROM redisfab/redis-x64-${OSNICK}:5.0.5

Dockerfile.arm

@@ -8,15 +8,13 @@ FROM redisfab/redis-${OSNICK}-xbuild:5.0.5 AS builder
 
 RUN [ "cross-build-start" ]
 
-ENV X_NPROC "cat /proc/cpuinfo|grep processor|wc -l"
-
 ADD ./ /build
 WORKDIR /build
 
 RUN ./deps/readies/bin/getpy2
 RUN ./system-setup.py
-RUN make deps
-RUN make -j$(eval "$X_NPROC")
+RUN make deps SHOW=1
+RUN make SHOW=1
 
 RUN [ "cross-build-end" ]
 

Makefile

@@ -35,7 +35,7 @@ $(BINDIR)/Makefile : CMakeLists.txt
 build: bindirs $(TARGET)
 
 $(TARGET): bindirs deps $(BINDIR)/Makefile
-	$(SHOW)$(MAKE) -C $(BINDIR)
+	$(SHOW)$(MAKE) -C $(BINDIR) -j $(shell nproc)
 	$(SHOW)cd bin; ln -sf ../$(TARGET) $(notdir $(TARGET))
 
 clean:
@@ -53,7 +53,7 @@ setup:
 	$(SHOW)./system-setup.py
 
 fetch deps:
-	$(SHOW)./get_deps.sh $(DEPS_FLAGS)
+	$(SHOW)VERBOSE=$(SHOW) ./get_deps.sh $(DEPS_FLAGS)
 
 #----------------------------------------------------------------------------------------------
 

get_deps.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # set -x
-set -e
+[[ $VERBOSE == 1 ]] && set -e
 
 if [[ "$1" == "cpu" ]]; then
 	GPU=no