isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not add LIBDL to SUDO_LIBS or SUDOERS_LIBS in configure, do it

Browse Source 
in Makefile.in so we can make it last.  Fixes a linking problem on
Ubuntu precise.
This commit is contained in:
Todd C. Miller
2013-11-26 07:15:55 -07:00
parent 94ad47ff98
commit 4247c1741b
4 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@@ -13747,6 +13747,8 @@ else
SHLIB_EXT="$_shrext" SHLIB_EXT="$_shrext"
fi fi
fi fi
LIBDL="$lt_cv_dlopen_libs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking path to sudo_noexec.so" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking path to sudo_noexec.so" >&5
$as_echo_n "checking path to sudo_noexec.so... " >&6; } $as_echo_n "checking path to sudo_noexec.so... " >&6; }
@@ -21040,15 +21042,6 @@ case "$lt_cv_dlopen" in
;; ;;
esac esac
#
# Add library needed for dynamic loading, if any.
#
LIBDL="$lt_cv_dlopen_libs"
if test X"$LIBDL" != X""; then
SUDO_LIBS="${SUDO_LIBS} $LIBDL"
SUDOERS_LIBS="${SUDOERS_LIBS} $LIBDL"
fi
# On HP-UX, you cannot dlopen() a shared object that uses pthreads unless # On HP-UX, you cannot dlopen() a shared object that uses pthreads unless
# the main program is linked against -lpthread. We have no knowledge of # the main program is linked against -lpthread. We have no knowledge of
# what libraries a plugin may depend on (e.g. HP-UX LDAP which uses pthreads) # what libraries a plugin may depend on (e.g. HP-UX LDAP which uses pthreads)

11
configure.ac
View File

@@ -1507,6 +1507,8 @@ else
SHLIB_EXT="$_shrext" SHLIB_EXT="$_shrext"
fi fi
fi fi
LIBDL="$lt_cv_dlopen_libs"
AC_MSG_CHECKING(path to sudo_noexec.so) AC_MSG_CHECKING(path to sudo_noexec.so)
AC_ARG_WITH(noexec, [AS_HELP_STRING([--with-noexec[=PATH]], [fully qualified pathname of sudo_noexec.so])], AC_ARG_WITH(noexec, [AS_HELP_STRING([--with-noexec[=PATH]], [fully qualified pathname of sudo_noexec.so])],
[case $with_noexec in [case $with_noexec in
@@ -3359,15 +3361,6 @@ case "$lt_cv_dlopen" in
;; ;;
esac esac
#
# Add library needed for dynamic loading, if any.
#
LIBDL="$lt_cv_dlopen_libs"
if test X"$LIBDL" != X""; then
SUDO_LIBS="${SUDO_LIBS} $LIBDL"
SUDOERS_LIBS="${SUDOERS_LIBS} $LIBDL"
fi
# On HP-UX, you cannot dlopen() a shared object that uses pthreads unless # On HP-UX, you cannot dlopen() a shared object that uses pthreads unless
# the main program is linked against -lpthread. We have no knowledge of # the main program is linked against -lpthread. We have no knowledge of
# what libraries a plugin may depend on (e.g. HP-UX LDAP which uses pthreads) # what libraries a plugin may depend on (e.g. HP-UX LDAP which uses pthreads)

4
plugins/sudoers/Makefile.in
View File

@@ -49,7 +49,7 @@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
LT_LIBS = $(top_builddir)/common/libcommon.la $(LIBOBJDIR)libreplace.la LT_LIBS = $(top_builddir)/common/libcommon.la $(LIBOBJDIR)libreplace.la
LIBS = $(LT_LIBS) @LIBINTL@ LIBS = $(LT_LIBS) @LIBINTL@
NET_LIBS = @NET_LIBS@ NET_LIBS = @NET_LIBS@
SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBDL@
REPLAY_LIBS = @REPLAY_LIBS@ @ZLIB@ REPLAY_LIBS = @REPLAY_LIBS@ @ZLIB@
# C preprocessor flags # C preprocessor flags
@@ -221,7 +221,7 @@ check_iolog_path: $(CHECK_IOLOG_PATH_OBJS) $(LT_LIBS)
check_symbols: $(CHECK_SYMBOLS_OBJS) $(LT_LIBS) check_symbols: $(CHECK_SYMBOLS_OBJS) $(LT_LIBS)
if [ X"$(soext)" != X"" ]; then \ if [ X"$(soext)" != X"" ]; then \
$(LIBTOOL) --mode=link $(CC) -o $@ $(CHECK_SYMBOLS_OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS) @SUDO_LIBS@; \ $(LIBTOOL) --mode=link $(CC) -o $@ $(CHECK_SYMBOLS_OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS) @LIBDL@; \
fi fi
check_wrap: $(CHECK_WRAP_OBJS) $(LT_LIBS) check_wrap: $(CHECK_WRAP_OBJS) $(LT_LIBS)

2
src/Makefile.in
View File

@@ -35,7 +35,7 @@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
# Libraries # Libraries
LT_LIBS = $(top_builddir)/common/libcommon.la $(LIBOBJDIR)libreplace.la LT_LIBS = $(top_builddir)/common/libcommon.la $(LIBOBJDIR)libreplace.la
LIBS = @LIBS@ @SUDO_LIBS@ @GETGROUPS_LIB@ @NET_LIBS@ @LIBINTL@ $(LT_LIBS) LIBS = @LIBS@ @SUDO_LIBS@ @GETGROUPS_LIB@ @NET_LIBS@ @LIBINTL@ $(LT_LIBS) @LIBDL@
# C preprocessor flags # C preprocessor flags
CPPFLAGS = -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@ CPPFLAGS = -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@