Removing ninja

.travis.yml

@@ -14,18 +14,17 @@ addons:
     packages:
     - gcc-{4.4,8}
     - clang-{3.5,6.0}
-    - ninja-build
 compiler:
 - gcc-8
 - clang-6.0
 - gcc-4.4
 - clang-3.5
-script: "./nginx-zero"
+script: './nginx-zero'
 deploy:
   provider: releases
   api_key:
     secure: HhJjsCMB+fb6FSovotxE0vkfU1aYdgS1+HlB08TXb6GVCKQ0fMUlKp2tyFNZQ+BH3b4CIze3nM6FcD08uM5EUGN+RgpkxWaCNtROu10V2ZR/IzaJ6dhOmV05AQEvruW2Zwval/3ArvgK06RL162MPJxg7irrv1yeQLxgH4QOY+Y30TddYnn+4WaioGuft/P1HG94hX6xx+pRei/XZPv6ijLbmYClfQ66ugA5bnRDGlLR0BjMOj/pKDFgmRIiJHs5eNGdox9+Gpk86AyhaWJgxQA1nVmmhKBl9okTd8eZ50Z6h+XOb76znXDEsnHiTsYL/f6Y1FL1WU9OF43Q+DTXW7YT2dpJABiXu3xCuQoGSXOKE8yDgJQCz84iSOrQ3VoGbl0Ipedr3BhF57uMojGvUFISqVUnMDBZOGnFCReoNRRbs8Zv+ORz+ZGAU+YnGmIE2ToOcjV3VvBggMjKrm7S9OsUJeM7vuytPx8v91OLFWrbIvRn0ElIdIJ43e2tH3iosuX/i9BaVZ5g9hiFWZXFw9JSUDwJ1UObsD7AkzN/wuDRC5FWpN3SPiT/OhuDVEV6roNMlO/SK1c1FFZMJQHAxFi5uH7rEIsZmjG+Qn48uuSDEXegDCot8PlLjZzJwdYl/DjI82cI70+ORtPc4e0Z7GaDM8TPUBzv9s4FCxmzXzQ=
-  file: "nginx.tar.gz"
+  file: 'nginx.tar.gz'
   skip_cleanup: true
   on:
     tags: true

README.md

@@ -20,7 +20,6 @@ The script (`nginx-zero`) requires:
  - git
  - make
  - cmake
- - ninja
  - patch
 
 `git clone --recurse-submodules -j8 git://github.com/concatime/nginx-zero`

nginx-zero

@@ -3,7 +3,7 @@
 # PC Files???
 
 set -xe
-hash make cmake ninja patch
+hash tar gzip make cmake nproc patch
 
 _CC=$(readlink -f $(which ${CC:-cc}))
 
@@ -35,20 +35,20 @@ cd deps
 cd musl
 #sed -i 's|-std=c99|-std=c11|' Makefile
 ./configure --prefix=/opt --enable-wrapper=$_CC #--enable-warnings
-make install -j`nproc`
+make -j`nproc` install
 cd -
 
 # Headers are required for LibreSSL & nginx
 cd kernel-headers
-make ARCH=x86_64 DESTDIR=/opt prefix= install
+make -j`nproc` ARCH=x86_64 DESTDIR=/opt prefix= install
 cd -
 
 #export CC=$_dir/bin/musl-$_CC LDFLAGS=-static
 export CC=/opt/bin/musl-$_CC LDFLAGS=-static
 
 cd jemalloc
 ./configure --prefix=/opt --disable-cxx
-make install_lib_static
+make -j`nproc` install_lib_static
 cd -
 
 # PCRE
@@ -58,7 +58,7 @@ cd -
 tar xf pcre-*.tar.gz
 cd pcre-*
 ./configure --prefix=/opt --enable-jit --enable-utf --enable-unicode-properties --disable-cpp --enable-shared=0
-make install-binSCRIPTS install-libLTLIBRARIES install-nodist_includeHEADERS # The bin is required for njs
+make -j`nproc` install-binSCRIPTS install-libLTLIBRARIES install-nodist_includeHEADERS # The bin is required for njs
 # pkgconfigDATA includeHEADERS=pcreposix
 cd -
 
@@ -67,16 +67,15 @@ cd -
 # https://github.com/libressl-portable/portable/tree/master#prerequisites-when-building-from-a-git-checkout
 tar xf libressl-*.tar.gz
 cd libressl-*
-cmake -GNinja -DCMAKE_INSTALL_PREFIX=/opt
-ninja
-ninja test
-ninja install
+cmake -DCMAKE_INSTALL_PREFIX=/opt
+make -j`nproc`
+make -j`nproc` test install
 cd -
 
 # ZLIB
 cd zlib
-cmake -GNinja -DCMAKE_INSTALL_PREFIX=/opt
-ninja zlibstatic
+cmake -DCMAKE_INSTALL_PREFIX=/opt
+make -j`nproc` zlibstatic
 cp libz.a /opt/lib
 cp zlib.h zconf.h /opt/include
 cd -
@@ -138,7 +137,7 @@ auto/configure \
 	#--with-cpu-opt
 	#--build="nginx/$NGINX (nginx-zero)" \
 	# THE CONFIG FILE DOES NOT CONSIDER LDFLAGS
-make install -j`nproc`
+make -j`nproc` install
 cd -
 
 tar czf $_root/nginx.tar.gz -C/opt nginx