From 4ae288cae34c5e1d291dad7b6b654fe37c4a221f Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Sat, 27 Nov 2021 04:21:00 +0000 Subject: [PATCH] feat(build): re-link eln files by default again This reverts commit d338c136db8acc4378154cf66ed7db5462787602. Thanks to using relinking with @rpath, paths are shorting leaving enough room in all *.eln files to be signed. --- README.md | 2 +- build-emacs-for-macos | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a4e933f..e354c11 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ 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-]relink-eln-files Enable/disable re-linking shared libraries in bundled *.eln files (default: enabled) --[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) diff --git a/build-emacs-for-macos b/build-emacs-for-macos index d383e8f..65f4c2b 100755 --- a/build-emacs-for-macos +++ b/build-emacs-for-macos @@ -1170,7 +1170,7 @@ if __FILE__ == $PROGRAM_NAME cli_options = { work_dir: File.expand_path(__dir__), native_full_aot: false, - relink_eln: false, + relink_eln: true, native_march: false, parallel: Etc.nprocessors, rsvg: true, @@ -1230,7 +1230,7 @@ if __FILE__ == $PROGRAM_NAME opts.on('--[no-]relink-eln-files', 'Enable/disable re-linking shared libraries in bundled *.eln ' \ - 'files (default: disabled)') do |v| + 'files (default: enabled)') do |v| cli_options[:relink_eln] = v end