merge cmake changes from master into icurel

src/SPC/builder/unix/library/nghttp2.php

@@ -40,13 +40,8 @@ trait nghttp2
 
         [,,$destdir] = SEPARATED_PATH;
 
-        shell()->cd($this->source_dir)
-            ->setEnv([
-                'CFLAGS' => $this->getLibExtraCFlags(),
-                'LDFLAGS' => $this->getLibExtraLdFlags(),
-                'LIBS' => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv(
+        shell()->cd($this->source_dir)->initializeEnv($this)
+            ->exec(
                 './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
@@ -55,9 +50,9 @@ trait nghttp2
                 $args . ' ' .
                 '--prefix='
             )
-            ->execWithEnv('make clean')
-            ->execWithEnv("make -j{$this->builder->concurrency}")
-            ->execWithEnv("make install DESTDIR={$destdir}");
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec("make install DESTDIR={$destdir}");
         $this->patchPkgconfPrefix(['libnghttp2.pc']);
         $this->patchLaDependencyPrefix(['libnghttp2.la']);
     }