chore(release): 0.6.35

Merge pull request #75 from jimeh/fix-libgccjit12-compatibility
fix(native-comp): compatibility with libgccjit 12 homebrew formula
2026-02-19 13:06:38 +00:00 · 2022-08-10 16:48:24 +01:00 · 2022-08-10 16:46:45 +01:00 · 2022-08-10 16:31:51 +01:00 · 2022-08-10 16:30:10 +01:00 · 2022-07-27 23:25:28 +01:00
2 changed files with 55 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+### [0.6.35](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.34...v0.6.35) (2022-08-10)
+
+
+### Bug Fixes
+
+* **native-comp:** compatibility with libgccjit 12 homebrew formula ([e0fd2b1](https://github.com/jimeh/build-emacs-for-macos/commit/e0fd2b16eb91ac5a98ed4ec31f4773ab22cbd470))
+
+### [0.6.34](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.33...v0.6.34) (2022-07-27)
+
+
+### Bug Fixes
+
+* **emacs-28:** patch configure.ac to support latest libgccjit ([b582523](https://github.com/jimeh/build-emacs-for-macos/commit/b582523642ad4c5298f5a7890edd9b48c0433684)), closes [#72](https://github.com/jimeh/build-emacs-for-macos/issues/72)
+
 ### [0.6.33](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.32...v0.6.33) (2022-04-30)

 ### [0.6.32](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.31...v0.6.32) (2022-04-30)
--- a/43
+++ b/43
@@ -671,6 +671,28 @@ class Build
      end
    end

+    if effective_version == 'emacs-28'
+      p << {
+        replace: [
+          'configure.ac',
+          'grep libgccjit.so\$',
+          'grep -E \'libgccjit\.(so|dylib)$\''
+        ],
+        allow_failure: true
+      }
+    end
+
+    if %w[emacs-28 emacs-29].include?(effective_version)
+      p << {
+        replace: [
+          'configure.ac',
+          'grep -E \'libgccjit\.(so|dylib)$\'',
+          'grep -E \'libgccjit\.(so|dylib)$\' | tail -1'
+        ],
+        allow_failure: true
+      }
+    end
+
    if effective_version == 'emacs-27'
      p << {
        url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
@@ -720,17 +742,34 @@ class Build
      err 'Patch replace input error' unless patch[:replace].size == 3

      file, before, after = patch[:replace]
+      info "Applying patch to #{file}..."
      filepath = File.join(target, file)

-      err "\"#{file}\" does not exist in #{target}" unless File.exist?(filepath)
+      unless File.exist?(filepath)
+        if patch[:allow_failure]
+          info "File #{filepath} does not exist, skipping patch."
+          return
+        end
+
+        err "\"#{file}\" does not exist in #{target}"
+      end

      f = File.open(filepath, 'rb')
      s = f.read
      sub = s.gsub!(before, after)
-      err "Replacement filed in #{file}" if sub.nil?
+
+      if sub.nil?
+        if patch[:allow_failure]
+          info 'Patch did not apply, skipping.'
+          return
+        end
+
+        err "Replacement failed in #{file}"
+      end

      f.reopen(filepath, 'wb').write(s)
      f.close
+      info "#{file} patched."
    end
  end
Author	SHA1	Message	Date
Jim Myhrberg	bfa5bcf79b	chore(release): 0.6.35	2022-08-10 16:48:24 +01:00
Jim Myhrberg	02d85f899f	Merge pull request #75 from jimeh/fix-libgccjit12-compatibility fix(native-comp): compatibility with libgccjit 12 homebrew formula	2022-08-10 16:46:45 +01:00
Jim Myhrberg	aeb3a75e5c	chore(patch): minor simplification to libgccjit patches By matching more targeted sets of strings, it should hopefully make these patches more future-proof.	2022-08-10 16:31:51 +01:00
Alice Rum	e0fd2b16eb	fix(native-comp): compatibility with libgccjit 12 homebrew formula Since the latest update of `libgccjit` in brew to version 12, emacs does not build again. Problem is that now dylib exists in multiple locations, and `MAC_CFLAGS` environment variable is not filled correctly in `configure.ac`. This commit fixes the issue.	2022-08-10 16:30:10 +01:00
Jim Myhrberg	d24ac084b7	chore(release): 0.6.34	2022-07-27 23:25:28 +01:00
Jim Myhrberg	159a7333de	Merge pull request #73 from jimeh/fix-emacs-28 fix(emacs-28): patch configure.ac to support latest libgccjit	2022-07-27 23:23:39 +01:00
Jim Myhrberg	b582523642	fix(emacs-28): patch configure.ac to support latest libgccjit When building Emacs 28.x the build script will attempt to patch configure.ac if needed to support the latest version of libgccjit which renamed libgccjit.so to libgccjit.dylib. Fixes #72	2022-07-27 23:18:58 +01:00