merge cmake changes from master into icurel

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

@@ -22,28 +22,17 @@ trait libtiff
         // We disabled lzma, zstd, webp, libdeflate by default to reduce the size of the binary
         $extra_libs .= ' --disable-lzma --disable-zstd --disable-webp --disable-libdeflate';
 
-        $shell = shell()->cd($this->source_dir)
-            ->setEnv([
-                'CFLAGS' => $this->getLibExtraCFlags(),
-                'LDFLAGS' => $this->getLibExtraLdFlags(),
-                'LIBS' => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv(
+        $shell = shell()->cd($this->source_dir)->initializeEnv($this)
+            ->exec(
                 './configure ' .
                 '--enable-static --disable-shared --with-pic ' .
                 "{$extra_libs} " .
                 '--disable-cxx ' .
                 '--prefix='
-            );
-
-        // TODO: Remove this check when https://gitlab.com/libtiff/libtiff/-/merge_requests/635 will be merged and released
-        if (file_exists($this->source_dir . '/html')) {
-            $shell->execWithEnv('make clean');
-        }
-
-        $shell
-            ->execWithEnv("make -j{$this->builder->concurrency}")
-            ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH);
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libtiff-4.pc']);
     }
 }