chore(release): 0.6.24

fix(embedding): embedding GCC fails when paths do not require sanitizing
It seems homebrew bottle of GCC for macOS Monterey (12.0) have changed their directory structure slightly, which caused an issue were we were trying to rename a specific directory to the same name it already had. This behavior is still required as it looks like GCC on macOS Catalina (10.15), the GCC homebrew bottle still uses the old directory structure.
2026-02-19 13:06:38 +00:00 · 2021-11-24 21:42:52 +00:00 · 2021-11-24 21:39:03 +00:00 · 2021-11-10 22:19:28 +00:00 · 2021-11-10 22:19:06 +00:00 · 2021-11-10 22:11:13 +00:00
3 changed files with 23 additions and 4 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.24](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.23...v0.6.24) (2021-11-24)
+
+
+### Bug Fixes
+
+* **embedding:** embedding GCC fails when paths do not require sanitizing ([8a467b0](https://github.com/jimeh/build-emacs-for-macos/commit/8a467b0d43140f6956d53c27e2319ae1b572868c))
+
+### [0.6.23](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.22...v0.6.23) (2021-11-10)
+
+
+### Bug Fixes
+
+* **build:** do not re-link eln files by default ([d338c13](https://github.com/jimeh/build-emacs-for-macos/commit/d338c136db8acc4378154cf66ed7db5462787602)), closes [#60](https://github.com/jimeh/build-emacs-for-macos/issues/60)
+
 ### [0.6.22](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.21...v0.6.22) (2021-11-10)


--- a/README.md
+++ b/README.md
@@ -81,8 +81,10 @@ Options:
        --[no-]native-comp           Enable/disable native-comp (default: enabled if supported)
        --[no-]native-march          Enable/disable -march=native CFLAG(default: disabled)
        --[no-]native-full-aot       Enable/disable NATIVE_FULL_AOT / Ahead of Time compilation (default: disabled)
+        --[no-]relink-eln-files      Enable/disable re-linking shared libraries in bundled *.eln files (default: disabled)
        --[no-]rsvg                  Enable/disable SVG image support via librsvg (default: enabled)
        --no-titlebar                Apply no-titlebar patch (default: disabled)
+        --posix-spawn                Apply posix-spawn patch (default: disabled)
        --no-frame-refocus           Apply no-frame-refocus patch (default: disabled)
        --[no-]github-auth           Make authenticated GitHub API requests if GITHUB_TOKEN environment variable is set.(default: enabled)
        --work-dir DIR               Specify a working directory where tarballs, sources, and builds will be stored and worked with
@@ -90,7 +92,8 @@ Options:
        --build-name NAME            Override generated build name
        --dist-include x,y,z         List of extra files to copy from Emacs source into build folder/archive (default: COPYING)
        --[no-]archive               Enable/disable creating *.tbz archive (default: enabled)
-        --[no-]archive-keep          Enable/disable keeping source folder for archive (default: disabled)
+        --[no-]archive-keep-build-dir
+                                     Enable/disable keeping source folder for archive (default: disabled)
        --plan FILE                  Follow given plan file, instead of using given git ref/sha
 ```

--- a/8
+++ b/8
@@ -966,7 +966,9 @@ class GccLibEmbedder < AbstractEmbedder
    FileUtils.cp_r(source_dir, target_dir)
    FileUtils.rm(Dir[File.join(target_dir, '**', '.DS_Store')], force: true)
    FileUtils.chmod_R('u+w', target_dir)
-    FileUtils.mv(source_darwin_dir, target_darwin_dir)
+    if source_darwin_dir != target_darwin_dir
+      FileUtils.mv(source_darwin_dir, target_darwin_dir)
+    end

    env_setup = ERB.new(NATIVE_COMP_ENV_VAR_TPL).result(gcc_info.get_binding)
    return if File.exist?(site_start_el_file) &&
@@ -1153,7 +1155,7 @@ if __FILE__ == $PROGRAM_NAME
  cli_options = {
    work_dir: File.expand_path(__dir__),
    native_full_aot: false,
-    relink_eln: true,
+    relink_eln: false,
    native_march: false,
    parallel: Etc.nprocessors,
    rsvg: true,
@@ -1213,7 +1215,7 @@ if __FILE__ == $PROGRAM_NAME

      opts.on('--[no-]relink-eln-files',
              'Enable/disable re-linking shared libraries in bundled *.eln ' \
-              'files (default: enabled)') do |v|
+              'files (default: disabled)') do |v|
        cli_options[:relink_eln] = v
      end
Author	SHA1	Message	Date
Jim Myhrberg	f1bf1d93b8	chore(release): 0.6.24	2021-11-24 21:42:52 +00:00
Jim Myhrberg	8a467b0d43	fix(embedding): embedding GCC fails when paths do not require sanitizing It seems homebrew bottle of GCC for macOS Monterey (12.0) have changed their directory structure slightly, which caused an issue were we were trying to rename a specific directory to the same name it already had. This behavior is still required as it looks like GCC on macOS Catalina (10.15), the GCC homebrew bottle still uses the old directory structure.	2021-11-24 21:39:03 +00:00
Jim Myhrberg	9c29f721b4	chore(release): 0.6.23	2021-11-10 22:19:28 +00:00
Jim Myhrberg	4ac71ddf39	docs(readme): update usage section with latest help text	2021-11-10 22:19:06 +00:00
Jim Myhrberg	d338c136db	fix(build): do not re-link eln files by default Relinking is currently failing for some of the *.eln files. See #60 for details of the error. Long-term plan is to investigate native-comp's compilation options to hopefully resolve this issue.	2021-11-10 22:11:13 +00:00