mirror of
https://github.com/jimeh/build-emacs-for-macos.git
synced 2026-02-19 13:06:38 +00:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78db99ea2d | ||
|
8a1ae4df1c
|
|||
|
|
5e2aaceb84 | ||
|
|
bcfdeacf95 | ||
|
2f0babae99
|
2
.github/.release-please-manifest.json
vendored
2
.github/.release-please-manifest.json
vendored
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
".": "0.6.46"
|
".": "0.6.48"
|
||||||
}
|
}
|
||||||
|
|||||||
14
CHANGELOG.md
14
CHANGELOG.md
@@ -1,5 +1,19 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.6.48](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.47...v0.6.48) (2024-08-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **local-lisp-path:** add Apple Silicon homebrew lisp-site ([8a1ae4d](https://github.com/jimeh/build-emacs-for-macos/commit/8a1ae4df1ca37a851f9936fcf2081536837e4c67))
|
||||||
|
|
||||||
|
## [0.6.47](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.46...v0.6.47) (2024-05-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **bootstrap:** remove --no-upgrade option from brew bundle ([2f0baba](https://github.com/jimeh/build-emacs-for-macos/commit/2f0babae990f908d706f5f60dc4a11573918c23d))
|
||||||
|
|
||||||
## [0.6.46](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.45...v0.6.46) (2024-04-03)
|
## [0.6.46](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.45...v0.6.46) (2024-04-03)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -51,7 +51,7 @@ bootstrap-ruby:
|
|||||||
bundle install
|
bundle install
|
||||||
|
|
||||||
bootstrap-brew:
|
bootstrap-brew:
|
||||||
brew bundle --verbose --no-upgrade
|
brew bundle --verbose
|
||||||
|
|
||||||
bootstrap-pip:
|
bootstrap-pip:
|
||||||
$(PIP) install -r requirements-ci.txt
|
$(PIP) install -r requirements-ci.txt
|
||||||
|
|||||||
@@ -38,17 +38,16 @@ The build produced does have some limitations:
|
|||||||
|
|
||||||
- [Xcode](https://apps.apple.com/gb/app/xcode/id497799835?mt=12)
|
- [Xcode](https://apps.apple.com/gb/app/xcode/id497799835?mt=12)
|
||||||
- [Homebrew](https://brew.sh/)
|
- [Homebrew](https://brew.sh/)
|
||||||
- All Homebrew formula listed in the `Brewfile`, which can all easily be
|
|
||||||
installed by running:
|
|
||||||
```
|
|
||||||
brew bundle
|
|
||||||
```
|
|
||||||
- Ruby 2.3.0 or later is needed to execute the build script itself. macOS comes
|
- Ruby 2.3.0 or later is needed to execute the build script itself. macOS comes
|
||||||
with Ruby, check your version with `ruby --version`. If it's too old, you can
|
with Ruby, check your version with `ruby --version`. If it's too old, you can
|
||||||
install a newer version with:
|
install a newer version with:
|
||||||
```
|
```
|
||||||
brew install ruby
|
brew install ruby
|
||||||
```
|
```
|
||||||
|
- All dependencies can all easily be installed by running:
|
||||||
|
```
|
||||||
|
make bootstrap
|
||||||
|
```
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
|
|||||||
@@ -442,13 +442,18 @@ class Build
|
|||||||
'/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib'
|
'/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib'
|
||||||
].compact.join(':')
|
].compact.join(':')
|
||||||
|
|
||||||
|
local_lisp_path = [
|
||||||
|
ENV.fetch('EMACS_LOCAL_LISP_PATH', '').split(':'),
|
||||||
|
'/Library/Application Support/Emacs/${version}/site-lisp',
|
||||||
|
'/Library/Application Support/Emacs/site-lisp',
|
||||||
|
'/usr/local/share/emacs/site-lisp',
|
||||||
|
'/opt/homebrew/share/emacs/site-lisp'
|
||||||
|
].flatten.join(':')
|
||||||
|
|
||||||
configure_flags = [
|
configure_flags = [
|
||||||
'--with-ns',
|
'--with-ns',
|
||||||
'--with-modules',
|
'--with-modules',
|
||||||
'--enable-locallisppath=' \
|
"--enable-locallisppath=#{local_lisp_path}"
|
||||||
'/Library/Application Support/Emacs/${version}/site-lisp:' \
|
|
||||||
'/Library/Application Support/Emacs/site-lisp:' \
|
|
||||||
'/usr/local/share/emacs/site-lisp'
|
|
||||||
]
|
]
|
||||||
if options[:xwidgets] && supports_xwidgets?
|
if options[:xwidgets] && supports_xwidgets?
|
||||||
configure_flags << '--with-xwidgets'
|
configure_flags << '--with-xwidgets'
|
||||||
|
|||||||
Reference in New Issue
Block a user