Skip to content

Commit 1127323

Browse files
bgilbertneheb
authored andcommitted
libffi: reformat
Reformat with Meson 1.9.0rc3, including the indentation bug in mesonbuild/meson#14935, then tweak the formatting to be more legible while still acceptable to `meson format`.
1 parent 9589533 commit 1127323

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

subprojects/packagefiles/libffi/meson.build

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,9 @@ elif host_cpu_family == 'frv'
136136
target = 'FRV'
137137
asm_sources = ['eabi.S']
138138
elif (host_cpu_family in ['hppa', 'hppa64'] and host_system in [
139-
'linux',
139+
'linux',
140140
'openbsd',
141-
]) or \
142-
(host_cpu_family == 'parisc' and host_system == 'linux')
141+
]) or (host_cpu_family == 'parisc' and host_system == 'linux')
143142
# FIXME: hppa family is missing in Meson
144143
target = 'PA_LINUX'
145144
targetdir = 'pa'
@@ -162,12 +161,11 @@ elif host_cpu_family == 'x86' and host_system in ['freebsd', 'openbsd']
162161
asm_sources = ['sysv_intel.S']
163162
endif
164163
elif (host_cpu_family == 'x86' and host_system in [
165-
'cygwin',
164+
'cygwin',
166165
'windows',
167166
'os2',
168167
'interix',
169-
]) or \
170-
(host_cpu_family == 'x86_64' and host_system in ['cygwin', 'windows'])
168+
]) or (host_cpu_family == 'x86_64' and host_system in ['cygwin', 'windows'])
171169
targetdir = 'x86'
172170
if size_t == 4
173171
target = 'X86_WIN32'
@@ -243,9 +241,9 @@ elif host_cpu_family == 'metag'
243241
# FIXME: metag family is missing in Meson
244242
target = 'METAG'
245243
elif host_cpu_family in ['mips', 'mips64'] and \
246-
(host_system.startswith('irix5.') or host_system.startswith('irix6.') or host_system.startswith(
247-
'rtems',
248-
))
244+
(host_system.startswith('irix5.') or
245+
host_system.startswith('irix6.') or
246+
host_system.startswith('rtems'))
249247
target = 'MIPS'
250248
asm_sources = ['o32.S', 'n32.S']
251249
elif host_cpu_family in ['mips', 'mips64'] and host_system in [
@@ -260,9 +258,15 @@ elif host_cpu_family in ['mips', 'mips64'] and host_system in [
260258
elif host_cpu_family == 'or1k'
261259
# FIXME: or1k family is missing in Meson
262260
target = 'OR1K'
263-
elif (host_cpu_family in ['ppc', 'ppc64'] and \
264-
host_system in ['linux', 'sysv', 'amigaos', 'eabi', 'beos', 'haiku', 'rtems']) or \
265-
(host_cpu_family == 'ppc64' and host_system == 'freebsd')
261+
elif (host_cpu_family in ['ppc', 'ppc64'] and host_system in [
262+
'linux',
263+
'sysv',
264+
'amigaos',
265+
'eabi',
266+
'beos',
267+
'haiku',
268+
'rtems',
269+
]) or (host_cpu_family == 'ppc64' and host_system == 'freebsd')
266270
target = 'POWERPC'
267271
c_sources = ['ffi.c', 'ffi_sysv.c', 'ffi_linux64.c']
268272
asm_sources = ['sysv.S', 'ppc_closure.S', 'linux64.S', 'linux64_closure.S']

0 commit comments

Comments
 (0)