From 7c17e4103b1772805e26058c055569e1fb1087d9 Mon Sep 17 00:00:00 2001
From: Joe Groocock <me@frebib.net>
Date: Wed, 13 Feb 2019 23:08:39 +0000
Subject: [PATCH] Simplify 'make' usage

---
 .drone.yml |  1 +
 Dockerfile | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 73236d1..797616a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,6 +3,7 @@ pipeline:
     image: spritsail/docker-build
     volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
     repo: plex-dev
+    make: true
 
   test-bin:
     image: spritsail/docker-test
diff --git a/Dockerfile b/Dockerfile
index 7a1f0f7..ccab68e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,8 @@ ARG XMLSTAR_VER
 ARG LIBRE_VER=2.8.2
 ARG CURL_VER
 
+ARG MAKEFLAGS=-j2
+
 RUN apt-get -y update \
  && apt-get -y install zlib1g-dev
 
@@ -34,8 +36,7 @@ RUN git clone https://gitlab.gnome.org/GNOME/libxml2.git --branch $LIBXML2_VER -
         --without-legacy \
         --without-modules \
         --without-python \
- && make -j$(nproc) \
- && make -j$(nproc) DESTDIR=/prefix install
+ && make DESTDIR=/prefix install
 
 # Download and build libxslt
 WORKDIR /tmp/libxslt
@@ -46,8 +47,7 @@ RUN git clone https://gitlab.gnome.org/GNOME/libxslt.git --branch $LIBXSLT_VER -
         --without-crypto \
         --without-plugins \
         --without-python \
- && make -j$(nproc) \
- && make -j$(nproc) DESTDIR=/prefix install
+ && make DESTDIR=/prefix install
 
 # Download and build xmlstarlet
 ADD xmlstarlet-*.patch /tmp
@@ -60,8 +60,7 @@ RUN git clone git://git.code.sf.net/p/xmlstar/code --branch $XMLSTAR_VER --depth
         --disable-build-docs \
         --with-libxml-prefix=/prefix/usr \
         --with-libxslt-prefix=/prefix/usr \
- && make -j$(nproc) \
- && make -j$(nproc) DESTDIR=/prefix install
+ && make DESTDIR=/prefix install
 
 # Download and build LibreSSL as a cURL dependency
 WORKDIR /tmp/libressl
@@ -69,7 +68,7 @@ RUN curl -sSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRE_VER}
         | tar xz --strip-components=1 \
     # Install to the default system directories so cURL can find it
  && ./configure --prefix=/usr \
- && make -j$(nproc) install
+ && make install
 
 # Download and build curl
 WORKDIR /tmp/curl
@@ -109,8 +108,7 @@ RUN git clone https://github.com/curl/curl.git --branch $CURL_VER --depth 1 . \
         --without-libpsl \
         --without-librtmp \
         --without-winidn \
- && make -j$(nproc) \
- && make -j$(nproc) DESTDIR=/prefix install
+ && make DESTDIR=/prefix install
 
 WORKDIR /prefix