specify the install name when building libwrap

This commit is contained in:
Mark Andrews 2019-11-13 13:15:48 +11:00 committed by Ondřej Surý
parent b88faee181
commit c7b20f3c40
3 changed files with 16 additions and 1 deletions

10
configure vendored
View file

@ -669,6 +669,7 @@ BIND9_ISCCFG_BUILDINCLUDE
BIND9_ISCCC_BUILDINCLUDE
BIND9_ISC_BUILDINCLUDE
BIND9_TOP_BUILDDIR
WRAP_NAME
WRAP_INTERPOSE
LD_WRAP_TESTS
KYUA
@ -21954,6 +21955,15 @@ rm -f core conftest.err conftest.$ac_objext \
WRAP_NAME=''
case $host in #(
*-darwin*) :
WRAP_NAME='${WRAP_NAME}' ;; #(
*) :
;;
esac
#
# Check for i18n
#

View file

@ -2204,6 +2204,10 @@ AX_RESTORE_FLAGS([interpose])
AC_SUBST([WRAP_INTERPOSE])
WRAP_NAME=''
AS_CASE([$host],[*-darwin*],[WRAP_NAME='${WRAP_NAME}'])
AC_SUBST([WRAP_NAME])
#
# Check for i18n
#

View file

@ -17,6 +17,7 @@ VERSION=@BIND9_VERSION@
WRAP_INTERPOSE= @WRAP_INTERPOSE@
WRAP_OPTIONS = -Wl,--wrap=isc_nmhandle_unref
WRAP_NAME = -Wl,-install_name,${top_builddir}/lib/ns/tests/$@
WRAP_RPATH = -Wl,-rpath,${top_builddir}/lib/ns/tests
WRAP_LIB = -L${top_builddir}/lib/ns/tests -lwrap
@ -60,7 +61,7 @@ LD_WRAP_TESTS=@LD_WRAP_TESTS@
@BIND9_MAKE_RULES@
libwrap.@SO@: wrap.@O@
${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} ${WRAP_INTERPOSE} -o $@ wrap.@O@ ${LIBS}
${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} ${WRAP_INTERPOSE} @WRAP_NAME@ -o $@ wrap.@O@ ${LIBS}
listenlist_test@EXEEXT@: listenlist_test.@O@ nstest.@O@ libwrap.@SO@ ${NSDEPLIBS} ${ISCDEPLIBS} ${DNSDEPLIBS}
if test "${LD_WRAP_TESTS}" = true -a -z "${LIBTOOL}"; then WRAP="${WRAP_OPTIONS}"; fi; \