Commit 43956bd
committed
meson: restore extension_memory as feature (fixes #829)
Commit 6502a67 (merge of PR #764) accidentally downgraded the
`extension_memory` option from `type: 'feature'` to `type: 'boolean'`
during conflict resolution. The PR itself just removed quotes around
boolean values (the Meson 1.1 deprecation fix), but its branch was
based on an older master where extension_memory was still boolean;
the merge resolution chose that stale version over master's `feature`.
meson.build still calls `build_memory.enabled()` and `.auto()`, which
are feature-option methods; on a boolean option they raise:
ERROR: Unknown method "enabled" in object
<[BooleanHolder] holds [bool]: False> of type BooleanHolder.
Restore the `type: 'feature', value: 'auto'` declaration that existed
on master before the merge. No change needed in meson.build; its usage
of enabled() + auto() is correct for a feature option.
Verified:
- `meson setup` now succeeds (pre-fix: failed with the error above)
- `meson configure -Dextension_memory=enabled` applies cleanly
- `ninja -C build` builds libunity.a including the memory extension1 parent c7b0faa commit 43956bd
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
0 commit comments