use latest make in homebrew formulae

GerHobbelt · Aug 11, 2021 · f4bc829 · f4bc829
1 parent ba3debb
commit f4bc829
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,7 +71,10 @@ jobs:
         brew tap cppfw/tap
         brew update
     - name: install ci tools
-      run: brew install myci
+      run: brew install myci make
+    - name: set PATH to use latest make
+      uses: myci-actions/export-env-var@master
+      with: {name: PATH, value: "/usr/local/opt/make/libexec/gnubin:$PATH"}
     - name: install deps
       run: myci-brew-install.sh `myci-list-deps-homebrew.sh`
     - name: build

diff --git a/conan/conanfile.py.in b/conan/conanfile.py.in
@@ -47,3 +47,7 @@ class AggConan(ConanFile):
 
 	def package_info(self):
 		self.cpp_info.libs = ["antigrain"]
+
+	# change package id only when minor or major version changes, i.e. when ABI breaks
+	def package_id(self):
+		self.info.requires.minor_mode()
diff --git a/homebrew/libantigrain.rb.in b/homebrew/libantigrain.rb.in
@@ -8,12 +8,13 @@ class Libantigrain < Formula
   depends_on "prorab-extra" => :build
   depends_on "myci" => :build
 
+  # use gmake here because otherwise homebrew uses default Mac's make which is of too old version 3.81
   def install
     ENV['PATH'] += ':/usr/local/bin'
-    system "make", "install", "PREFIX=#{prefix}"
+    system "/usr/local/opt/make/libexec/gnubin/make", "install", "PREFIX=#{prefix}"
   end
 
   test do
-    system "make", "test"
+    system "/usr/local/opt/make/libexec/gnubin/make", "test"
   end
 end