Skip to contentSkip to conversation

meson: Fix meson build with --enable-libdaxctl

PATCH Applied Bruce Rogers 3 participants 3 messages Aug 24, 2020 – Aug 25, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: Fix meson build with --enable-libdaxctl

The daxctl library needs to be linked against when daxctl is asked for in configure.

---
 configure   | 1 +
 meson.build | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
configure +1 -0
index 67832e3bab..15de7d10de 100755
@@ -7488,6 +7488,7 @@ fi
 
 if test "$libdaxctl" = "yes" ; then
   echo "CONFIG_LIBDAXCTL=y" >> $config_host_mak
+  echo "LIBDAXCTL_LIBS=$libdaxctl_libs" >> $config_host_mak
 fi
 
 if test "$bochs" = "yes" ; then
meson.build +5 -1
index df5bf728b5..0a24e5c31a 100644
@@ -380,6 +380,10 @@ if 'CONFIG_LIBPMEM' in config_host
   libpmem = declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS'].split(),
                                link_args: config_host['LIBPMEM_LIBS'].split())
 endif
+libdaxctl = not_found
+if 'CONFIG_LIBDAXCTL' in config_host
+  libdaxctl = declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'].split())
+endif
 
 # Create config-host.h
 
@@ -786,7 +790,7 @@ common_ss.add(files('cpus-common.c'))
 
 subdir('softmmu')
 
-specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem)
+specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem, libdaxctl)
 specific_ss.add(files('exec-vary.c'))
 specific_ss.add(when: 'CONFIG_TCG', if_true: files(
   'fpu/softfloat.c',
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw

Hi

Quoted 5 lines · Bruce Rogers

The daxctl library needs to be linked against when daxctl is asked for in configure.

I guess we should cover it too in the CI.

---

Quoted 50 lines
 configure   | 1 +
 meson.build | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
configure +1 -0
index 67832e3bab..15de7d10de 100755
@@ -7488,6 +7488,7 @@ fi
 
 if test "$libdaxctl" = "yes" ; then
   echo "CONFIG_LIBDAXCTL=y" >> $config_host_mak
+  echo "LIBDAXCTL_LIBS=$libdaxctl_libs" >> $config_host_mak
 fi
 
 if test "$bochs" = "yes" ; then
meson.build +4 -0
index df5bf728b5..0a24e5c31a 100644
@@ -380,6 +380,10 @@ if 'CONFIG_LIBPMEM' in config_host
   libpmem = declare_dependency(compile_args:
 config_host['LIBPMEM_CFLAGS'].split(),
                                link_args:
 config_host['LIBPMEM_LIBS'].split())
 endif
+libdaxctl = not_found
+if 'CONFIG_LIBDAXCTL' in config_host
+  libdaxctl = declare_dependency(link_args:
 config_host['LIBDAXCTL_LIBS'].split())
+endif

# Create config-host.h

meson.build +1 -1
@@ -786,7 +790,7 @@ common_ss.add(files('cpus-common.c'))
 
 subdir('softmmu')
 
-specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone,
 libpmem)
+specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone,
 libpmem, libdaxctl)
 specific_ss.add(files('exec-vary.c'))

specific_ss.add(when: 'CONFIG_TCG', if_true: files(
'fpu/softfloat.c',
--
2.28.0

Signature · 1 line
Marc-André Lureau
#2 lore raw
In reply to Bruce Rogers

Queued, thanks.

Paolo

Il lun 24 ago 2020, 17:52 Bruce Rogers <[email protected]> ha scritto:

Quoted 54 lines

The daxctl library needs to be linked against when daxctl is asked for in configure.

---
 configure   | 1 +
 meson.build | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
configure +1 -0
index 67832e3bab..15de7d10de 100755
@@ -7488,6 +7488,7 @@ fi
 
 if test "$libdaxctl" = "yes" ; then
   echo "CONFIG_LIBDAXCTL=y" >> $config_host_mak
+  echo "LIBDAXCTL_LIBS=$libdaxctl_libs" >> $config_host_mak
 fi
 
 if test "$bochs" = "yes" ; then
meson.build +4 -0
index df5bf728b5..0a24e5c31a 100644
@@ -380,6 +380,10 @@ if 'CONFIG_LIBPMEM' in config_host
   libpmem = declare_dependency(compile_args:
 config_host['LIBPMEM_CFLAGS'].split(),
                                link_args:
 config_host['LIBPMEM_LIBS'].split())
 endif
+libdaxctl = not_found
+if 'CONFIG_LIBDAXCTL' in config_host
+  libdaxctl = declare_dependency(link_args:
 config_host['LIBDAXCTL_LIBS'].split())
+endif

# Create config-host.h

meson.build +1 -1
@@ -786,7 +790,7 @@ common_ss.add(files('cpus-common.c'))
 
 subdir('softmmu')
 
-specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone,
 libpmem)
+specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone,
 libpmem, libdaxctl)
 specific_ss.add(files('exec-vary.c'))

specific_ss.add(when: 'CONFIG_TCG', if_true: files(
'fpu/softfloat.c',
--
2.28.0