ThrowTheSwitch/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-06-05 21:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: restore extension_memory as feature (fixes #829)

Browse Source 
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 extension
This commit is contained in:
aditya
2026-05-22 15:41:36 +05:30
parent c7b0faabdc
commit 43956bd0bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson_options.txt
+1 -1
View File
@@ -1,5 +1,5 @@
option('extension_fixture', type: 'boolean', value: false, description: 'Whether to enable the fixture extension.')
option('extension_memory', type: 'boolean', value: false, description: 'Whether to enable the memory extension.')
option('extension_memory', type: 'feature', value: 'auto', description: 'Whether to enable the memory extension. By default this is automatically enabled when extension_fixture is enabled.')
option('support_double', type: 'boolean', value: false, description: 'Whether to enable double precision floating point assertions.')
option('support_int64', type: 'boolean', value: false, description: 'Whether to enable support for 64bit integers. false means autodetect.')
option('fixture_help_message', type: 'string', description: 'If the fixture extension is enabled, this allows a custom help message to be defined.')