wip

Author: mxcl

projects/cmake.org/build.ts

@@ -1,21 +1,15 @@
 import { BuildOptions, run, unarchive } from "brewkit";
 
-//TODO has more deps that it vendors
-// use --sysmem-libs to use them
+//NOTE we statically link everything because we have a policy
+// where build tools have no deps to prevent their deps inadvertently
+// leaking into other builds
 
 export default async function ({ prefix, deps, version }: BuildOptions) {
   await unarchive(`https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}.tar.gz`);
 
-  const extra_args = Deno.build.os != "darwin"
-    ? `-DZLIB_LIBRARY=${deps["zlib.net"].prefix}/lib/libz.so
-       -DZLIB_INCLUDE_DIR=${deps["zlib.net"].prefix}/include
-       -DCURL_LIBRARY=${deps["curl.se"].prefix}/lib/libcurl.so
-       -DCURL_INCLUDE_DIR=${deps["curl.se"].prefix}/include
-       -DBZIP2_LIBRARIES=${deps["sourceware.org/bzip2"].prefix}/lib/libbz2.so
-       -DBZIP2_INCLUDE_DIR=${deps["sourceware.org/bzip2"].prefix}/include`
-    : "";
-
-  if (Deno.build.os != "windows") {
+  try {
+    env_include("cmake.org");
+  } catch {
     run`./bootstrap
         --prefix=${prefix}
         --docdir=/share/doc
@@ -26,18 +20,21 @@ export default async function ({ prefix, deps, version }: BuildOptions) {
         --
         -DCMake_BUILD_LTO=ON
         -DCMAKE_BUILD_TYPE=Release
-        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-        ${extra_args}
         `;
-    run`make --jobs ${navigator.hardwareConcurrency} install`;
-  } else {
-    run`cmake . -B build
-        -DCMAKE_INSTALL_PREFIX=${prefix}
-        -DCMAKE_BUILD_TYPE=Release
-        ${extra_args}`;
-    run`cmake --build build --config Release --target install --parallel ${navigator.hardwareConcurrency}`;
   }
 
+  run`cmake
+      -S .
+      -B build
+      -DCMake_BUILD_LTO=ON
+      -DCMAKE_INSTALL_PREFIX=${prefix}
+      -DCMAKE_BUILD_TYPE=Release`;
+  run`cmake
+    --build build
+    --config Release
+    --target install
+    --parallel`;
+
   // we have a “docs are on the Internet” policy
   prefix.share.join(`cmake-${version.marketing}/Help`).rm("rf");
 }

projects/cmake.org/package.yml

@@ -10,18 +10,6 @@ darwin:
   programs:
     - bin/ccmake
 
-linux:
-  dependencies:
-    curl.se: ">=5"
-    zlib.net: ^1
-    sourceware.org/bzip2: ^1
-
-windows:
-  dependencies:
-    curl.se: ">=5"
-    zlib.net: ^1
-    sourceware.org/bzip2: ^1
-
 platforms:
   - linux
   - darwin

projects/python.org/package.yml

@@ -14,13 +14,12 @@ dependencies:
 linux:
   dependencies:
     github.com/libexpat: ^2
-    sourceware.org/bzip2: ^1
     gnu.org/readline: ^7,^8
     invisible-island.net/ncurses: ^6
-    zlib.net: ^1
-    tukaani.org/xz: ^5
-    sqlite.org: ^3
+    sourceware.org/bzip2: ^1
     sourceware.org/libffi: ^3
+    sqlite.org: ^3
+    zlib.net: ^1
   # TODO
   # bytereef.org/mpdecimal: 2
   # tcl-lang.org: 8
@@ -35,6 +34,7 @@ programs:
 platforms:
   - darwin
   - linux
+  - windows
 
 knobs:
   - side-by-side