meson: Fix libnm-util build
This was broken bye01f7f2c6d
. Port the commit's changes from libnm to libnm-util. (cherry picked from commit4bfd0bab0d
)
This commit is contained in:

committed by
Beniamino Galvani

parent
58e5627909
commit
c6cd8b3ee1
@@ -57,7 +57,6 @@ libnm_utils_enum = gnome.mkenums(
|
|||||||
|
|
||||||
sources = files(
|
sources = files(
|
||||||
'crypto.c',
|
'crypto.c',
|
||||||
'crypto_' + crypto + '.c',
|
|
||||||
'nm-connection.c',
|
'nm-connection.c',
|
||||||
'nm-param-spec-specialized.c',
|
'nm-param-spec-specialized.c',
|
||||||
'nm-setting-8021x.c',
|
'nm-setting-8021x.c',
|
||||||
@@ -93,7 +92,6 @@ sources = files(
|
|||||||
sources += shared_files_libnm_util
|
sources += shared_files_libnm_util
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
crypto_dep,
|
|
||||||
dbus_dep,
|
dbus_dep,
|
||||||
dbus_glib_dep,
|
dbus_glib_dep,
|
||||||
shared_dep,
|
shared_dep,
|
||||||
@@ -108,6 +106,32 @@ cflags = common_cflags + [
|
|||||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name)
|
'-DG_LOG_DOMAIN="@0@"'.format(libnm_util_name)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if crypto_gnutls_dep.found()
|
||||||
|
libnm_util_crypto_gnutls = static_library(
|
||||||
|
'nm-util-crypto-gnutls',
|
||||||
|
sources: [ 'crypto_gnutls.c' ],
|
||||||
|
dependencies: deps + [ crypto_gnutls_dep ],
|
||||||
|
c_args: cflags
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
|
if crypto_nss_dep.found()
|
||||||
|
libnm_util_crypto_nss = static_library(
|
||||||
|
'nm-util-crypto-nss',
|
||||||
|
sources: [ 'crypto_nss.c' ],
|
||||||
|
dependencies: deps + [ crypto_nss_dep ],
|
||||||
|
c_args: cflags
|
||||||
|
)
|
||||||
|
endif
|
||||||
|
|
||||||
|
if crypto == 'gnutls'
|
||||||
|
libnm_util_crypto = libnm_util_crypto_gnutls
|
||||||
|
elif crypto == 'nss'
|
||||||
|
libnm_util_crypto = libnm_util_crypto_nss
|
||||||
|
else
|
||||||
|
error('bug')
|
||||||
|
endif
|
||||||
|
|
||||||
linker_script = join_paths(meson.current_source_dir(), 'libnm-util.ver')
|
linker_script = join_paths(meson.current_source_dir(), 'libnm-util.ver')
|
||||||
|
|
||||||
libnm_util = shared_library(
|
libnm_util = shared_library(
|
||||||
@@ -120,6 +144,7 @@ libnm_util = shared_library(
|
|||||||
'-Wl,--version-script,@0@'.format(linker_script),
|
'-Wl,--version-script,@0@'.format(linker_script),
|
||||||
],
|
],
|
||||||
link_depends: linker_script,
|
link_depends: linker_script,
|
||||||
|
link_with: libnm_util_crypto,
|
||||||
install: true
|
install: true
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -174,11 +199,9 @@ test(
|
|||||||
|
|
||||||
sources = files(
|
sources = files(
|
||||||
'crypto.c',
|
'crypto.c',
|
||||||
'crypto_' + crypto + '.c'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
crypto_dep,
|
|
||||||
shared_dep
|
shared_dep
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -186,6 +209,7 @@ libtest_crypto = static_library(
|
|||||||
'test-crypto',
|
'test-crypto',
|
||||||
sources: sources,
|
sources: sources,
|
||||||
dependencies: deps,
|
dependencies: deps,
|
||||||
|
link_with: libnm_util_crypto,
|
||||||
c_args: cflags
|
c_args: cflags
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user