shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

build-sys: Add libsodium to OT_DEP_CRYPTO

Browse Source 
There's no reason to have these distinct really.  If we're using
libsodium, we want it in the same places we're using openssl.

Prep for further refactoring.
This commit is contained in:
Colin Walters 2023-07-08 15:42:12 -04:00
parent a6d9c714c6
commit 265cf7d786
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile-libostree.am
View File

@ -262,11 +262,6 @@ libostree_1_la_SOURCES += \
src/libostree/ostree-sign-private.h \ src/libostree/ostree-sign-private.h \
$(NULL) $(NULL)
if USE_LIBSODIUM
libostree_1_la_CFLAGS += $(OT_DEP_LIBSODIUM_CFLAGS)
libostree_1_la_LIBADD += $(OT_DEP_LIBSODIUM_LIBS)
endif # USE_LIBSODIUM
if USE_COMPOSEFS if USE_COMPOSEFS
libostree_1_la_LIBADD += libcomposefs.la libostree_1_la_LIBADD += libcomposefs.la
endif # USE_COMPOSEFS endif # USE_COMPOSEFS

5
Makefile-ostree.am
View File

@ -153,8 +153,3 @@ if USE_LIBARCHIVE
ostree_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS) ostree_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
ostree_LDADD += $(OT_DEP_LIBARCHIVE_LIBS) ostree_LDADD += $(OT_DEP_LIBARCHIVE_LIBS)
endif endif
if USE_LIBSODIUM
ostree_CFLAGS += $(OT_DEP_LIBSODIUM_CFLAGS)
ostree_LDADD += $(OT_DEP_LIBSODIUM_LIBS)
endif # USE_LIBSODIUM

4
configure.ac
View File

@ -465,6 +465,10 @@ AS_IF([ test $with_crypto = gnutls ], [
AM_CONDITIONAL(USE_GNUTLS, test $with_crypto = gnutls) AM_CONDITIONAL(USE_GNUTLS, test $with_crypto = gnutls)
dnl end gnutls dnl end gnutls
dnl we always inject libsodium into our crypto deps in addition to openssl/gnutls
OT_DEP_CRYPTO_CFLAGS="${OT_DEP_CRYPTO_CFLAGS} ${OT_DEP_LIBSODIUM_CFLAGS}"
OT_DEP_CRYPTO_LIBS="${OT_DEP_CRYPTO_LIBS} ${OT_DEP_LIBSODIUM_LIBS}"
dnl Avahi dependency for finding repos dnl Avahi dependency for finding repos
AVAHI_DEPENDENCY="avahi-client >= 0.6.31 avahi-glib >= 0.6.31" AVAHI_DEPENDENCY="avahi-client >= 0.6.31 avahi-glib >= 0.6.31"