Skip to content

Commit 49d4eff

Browse files
heitbaumjmvalin
authored andcommitted
fix arm asm meson source build
meson does mot support output with paths; add a meson.build file in the arm directory. The output files were being incorrectly placed in the celt/ directory. Program arm/arm2gnu.pl found: YES (/var/media/DATA/home-rudi/LibreELEC.kernel11/build.LibreELEC-H3.arm-12.0-devel/build/opus-v1.5.1/celt/arm/arm2gnu.pl) Configuring celt_pitch_xcorr_arm-gnu.S with command ../celt/meson.build:51:25: ERROR: configure_file keyword argument "output" Output 'arm/armopts.s' must not contain a path segment. before: celt/celt_pitch_xcorr_arm-gnu.S after: celt/arm/celt_pitch_xcorr_arm-gnu.S celt/arm/armopts.s celt/arm/armopts-gnu.S Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
1 parent fcecf99 commit 49d4eff

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

celt/arm/meson.build

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
arm2gnu = [find_program('arm2gnu.pl')] + arm2gnu_args
2+
celt_sources_arm_asm = configure_file(input: 'celt_pitch_xcorr_arm.s',
3+
output: '@BASENAME@-gnu.S',
4+
command: arm2gnu + ['@INPUT@'],
5+
capture: true)
6+
celt_arm_armopts_s_in = configure_file(input: 'armopts.s.in',
7+
output: 'armopts.s',
8+
configuration: opus_conf)
9+
celt_arm_armopts_s = configure_file(input: [celt_arm_armopts_s_in],
10+
output: '@BASENAME@-gnu.S',
11+
command: arm2gnu + ['@INPUT@'],
12+
capture: true)

celt/meson.build

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,7 @@ if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm
4343
celt_sources += sources['CELT_SOURCES_ARM_NE10']
4444
endif
4545
if opus_arm_external_asm
46-
arm2gnu = [find_program('arm/arm2gnu.pl')] + arm2gnu_args
47-
celt_sources_arm_asm = configure_file(input: 'arm/celt_pitch_xcorr_arm.s',
48-
output: '@BASENAME@-gnu.S',
49-
command: arm2gnu + ['@INPUT@'],
50-
capture: true)
51-
celt_arm_armopts_s = configure_file(input: 'arm/armopts.s.in',
52-
output: 'arm/armopts.s',
53-
configuration: opus_conf)
46+
subdir('arm')
5447
celt_static_libs += static_library('celt-armasm',
5548
celt_arm_armopts_s, celt_sources_arm_asm,
5649
install: false)

0 commit comments

Comments
 (0)