From 2dc3200dc18b5c1228039f83b27f163d504401c7 Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Wed, 31 Jan 2024 09:40:26 -0500
Subject: [PATCH] use new brewkit for gcc ar/ranlib fix

---
 .../AgentD/squashfs-tools-ng/package.yml      | 24 +++++++------------
 projects/open-mpi.org/package.yml             |  6 -----
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/projects/github.com/AgentD/squashfs-tools-ng/package.yml b/projects/github.com/AgentD/squashfs-tools-ng/package.yml
index 091e460b..0a9fca4b 100644
--- a/projects/github.com/AgentD/squashfs-tools-ng/package.yml
+++ b/projects/github.com/AgentD/squashfs-tools-ng/package.yml
@@ -1,12 +1,15 @@
 distributable:
-  url: https://codeload.github.com/AgentD/squashfs-tools-ng/tar.gz/refs/tags/v{{version}}
+  url: https://infraroot.at/pub/squashfs/squashfs-tools-ng-{{version}}.tar.xz
   strip-components: 1
 
 display-name: squashfs-tools-ng
 
 versions:
-  github: AgentD/squashfs-tools-ng/tags
-  strip: /^v/
+  url: https://infraroot.at/pub/squashfs/
+  match: /squashfs-tools-ng-\d+\.\d+(\.\d+)?\.tar\.gz/
+  strip:
+    - /^squashfs-tools-ng-/
+    - /.tar.gz$/
 
 dependencies:
   zlib.net: ^1
@@ -17,25 +20,14 @@ dependencies:
 
 build:
   dependencies:
-    freedesktop.org/pkg-config: '*'
     gnu.org/coreutils: '*'
     gnu.org/libtool: '*'
-    gnu.org/automake: '*'
-    gnu.org/autoconf: '*'
     gnu.org/gawk: '*'
     gnu.org/gcc: '*'
     cmake.org: ^3
   script:
-    - autoreconf --force --install --symlink
-    - ./configure $ARGS
-    - make --jobs {{ hw.concurrency }} install
-  env:
-    ARGS:
-      - --prefix="{{prefix}}"
-    darwin:
-      # FIXME: binutils ar/ranlib are broken on macOS?
-      AR: /usr/bin/ar
-      RANLIB: /usr/bin/ranlib
+    - ./configure --prefix="{{prefix}}"
+    - make --jobs {{ hw.concurrency }} install V=1
 
 provides:
   - bin/gensquashfs
diff --git a/projects/open-mpi.org/package.yml b/projects/open-mpi.org/package.yml
index ebfb8911..6eccfd6b 100644
--- a/projects/open-mpi.org/package.yml
+++ b/projects/open-mpi.org/package.yml
@@ -45,14 +45,8 @@ build:
 
     - install {{prefix}}/lib/*.mod {{prefix}}/include/
   env:
-    linux:
-      AR: ${{deps.gnu.org/binutils.prefix}}/bin/ar
-      RANLIB: ${{deps.gnu.org/binutils.prefix}}/bin/ranlib
     CXXFLAGS: $CXXFLAGS -std=c++11
     darwin:
-      # FIXME: binutils ar/ranlib are broken on macOS?
-      AR: /usr/bin/ar
-      RANLIB: /usr/bin/ranlib
       CFLAGS: $CFLAGS -Wl,-rpath,{{pkgx.prefix}}
       CXXFLAGS: $CXXFLAGS -Wl,-rpath,{{pkgx.prefix}}
       FCFLAGS: $FCFLAGS -Wl,-rpath,{{pkgx.prefix}}