mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 14:25:15 +00:00
Code Issues Releases Wiki Activity

Use explicit library dependencies instead of implicit.

Browse Source 
We now include all the dependent libraries when linking.
Fixes a linking problem on CentOS Stream 9.
This commit is contained in:
Todd C. Miller
2022-05-19 17:01:14 -06:00
parent 0b63af91bb
commit 583e8bf538
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -3678,7 +3678,7 @@ LOGSRVD=
LOGSRVD_SRC=logsrvd
LOGSRV_SRC=lib/logsrv
LOGSRVD_CONF='sudo_logsrvd.conf'
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la'
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'
PPFILES='$(srcdir)/etc/sudo.pp'
RTLD_PRELOAD_VAR="LD_PRELOAD"

2
configure.ac
View File

@@ -289,7 +289,7 @@ LOGSRVD=
LOGSRVD_SRC=logsrvd
LOGSRV_SRC=lib/logsrv
LOGSRVD_CONF='sudo_logsrvd.conf'
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la'
LIBLOGSRV='$(top_builddir)/lib/logsrv/liblogsrv.la $(top_builddir)/lib/protobuf-c/libprotobuf-c.la'
PPFILES='$(srcdir)/etc/sudo.pp'
dnl

9
lib/iolog/Makefile.in
View File

@@ -38,8 +38,7 @@ SHA1SUM = @SHA1SUM@
SED = @SED@
# Libraries
LT_LIBS = $(top_builddir)/lib/eventlog/libsudo_eventlog.la \
$(top_builddir)/lib/util/libsudo_util.la
LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la
LIBS = @LIBS@ @ZLIB@ $(LT_LIBS)
# C preprocessor flags
@@ -78,7 +77,8 @@ PVS_IGNORE = 'V707,V011,V002,V536'
PVS_LOG_OPTS = -a 'GA:1,2' -e -t errorfile -d $(PVS_IGNORE)
# Regression tests
TEST_PROGS = check_iolog_filter check_iolog_json check_iolog_mkpath check_iolog_path check_iolog_timing host_port_test
TEST_PROGS = check_iolog_filter check_iolog_json check_iolog_mkpath \
check_iolog_path check_iolog_timing host_port_test
TEST_LIBS = @LIBS@
TEST_LDFLAGS = @LDFLAGS@
TEST_VERBOSE =
@@ -88,7 +88,8 @@ LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la
LIB_FUZZING_ENGINE = @FUZZ_ENGINE@
FUZZ_PROGS = fuzz_iolog_json fuzz_iolog_legacy fuzz_iolog_timing
FUZZ_SEED_CORPUS = ${FUZZ_PROGS:=_seed_corpus.zip}
FUZZ_LIBS = $(LIB_FUZZING_ENGINE) @LIBS@
FUZZ_LIBS = $(LIB_FUZZING_ENGINE) @LIBS@ \
$(top_builddir)/lib/eventlog/libsudo_eventlog.la
FUZZ_LDFLAGS = @LDFLAGS@
FUZZ_MAX_LEN = 4096
FUZZ_RUNS = 8192

2
lib/logsrv/Makefile.in
View File

@@ -35,7 +35,7 @@ CC = @CC@
LIBTOOL = @LIBTOOL@
# Libraries
LT_LIBS = $(top_builddir)/lib/protobuf-c/libprotobuf-c.la
LT_LIBS =
# C preprocessor flags
CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@

4
logsrvd/Makefile.in
View File

@@ -45,7 +45,9 @@ INSTALL_BACKUP = @INSTALL_BACKUP@
# Libraries
LT_LIBS = $(top_builddir)/lib/iolog/libsudo_iolog.la \
$(top_builddir)/lib/logsrv/liblogsrv.la
$(top_builddir)/lib/eventlog/libsudo_eventlog.la \
$(top_builddir)/lib/logsrv/liblogsrv.la \
$(top_builddir)/lib/protobuf-c/libprotobuf-c.la
LIBS = $(LT_LIBS) @LIBTLS@
# C preprocessor defines

2
plugins/sudoers/Makefile.in
View File

@@ -58,7 +58,7 @@ INSTALL_BACKUP = @INSTALL_BACKUP@
# Libraries
LIBFUZZSTUB = $(top_builddir)/lib/fuzzstub/libsudo_fuzzstub.la
LIBEVENTLOG = $(top_builddir)/lib/eventlog/libsudo_eventlog.la
LIBIOLOG = $(top_builddir)/lib/iolog/libsudo_iolog.la
LIBIOLOG = $(top_builddir)/lib/iolog/libsudo_iolog.la $(LIBEVENTLOG)
LIBLOGSRV = @LIBLOGSRV@
LIBUTIL = $(top_builddir)/lib/util/libsudo_util.la
LIBS = $(LIBUTIL)