diff --git a/CHANGES b/CHANGES index dcbf0e187b..d7f7f416f8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1524. [port] AIX needs to be able to resolve all symbols when + creating shared libraries (--with-libtool). + 1523. [bug] Fix race condition in rbtdb. [RT# 9189] 1522. [bug] dns_db_findnode() relax the requirements on 'name'. diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index 05704e38ad..a39db58e1a 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.118 2003/09/30 05:56:02 marka Exp $ +# $Id: Makefile.in,v 1.119 2003/10/08 06:36:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -281,7 +281,7 @@ journalprint@EXEEXT@: journalprint.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} cfg_test@EXEEXT@: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS} ${LIBTOOL} ${CC} ${CFLAGS} -o $@ cfg_test.@O@ \ - ${ISCCFGLIBS} ${ISCLIBS} ${LIBS} + ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS} distclean:: rm -f headerdep_test.sh diff --git a/lib/Makefile.in b/lib/Makefile.in index 7903bf8670..db7224b4c5 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.16 2001/09/20 15:16:50 marka Exp $ +# $Id: Makefile.in,v 1.17 2003/10/08 06:36:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ # Attempt to disable parallel processing. .NOTPARALLEL: .NO_PARALLEL: -SUBDIRS = isc isccc isccfg dns bind9 lwres tests +SUBDIRS = isc isccc dns isccfg bind9 lwres tests TARGETS = @BIND9_MAKE_RULES@ diff --git a/lib/bind/Makefile.in b/lib/bind/Makefile.in index d1bc163fda..1637f0e06e 100644 --- a/lib/bind/Makefile.in +++ b/lib/bind/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.18 2002/12/13 02:00:15 marka Exp $ +# $Id: Makefile.in,v 1.19 2003/10/08 06:36:10 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -21,6 +21,8 @@ top_srcdir = @top_srcdir@ @LIBBIND_API@ +LIBS = @LIBS@ + DAEMON_OBJS=bsd/daemon.@O@ STRSEP_OBJS=bsd/strsep.@O@ diff --git a/lib/bind/configure b/lib/bind/configure index 38781a8142..2bc1b47f9b 100644 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -8151,7 +8151,7 @@ else hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' # Warning - without using the other run time loading flags, -berok will # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok" + allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' diff --git a/lib/bind/libtool.m4 b/lib/bind/libtool.m4 index 6f43c7729d..f96059b080 100644 --- a/lib/bind/libtool.m4 +++ b/lib/bind/libtool.m4 @@ -1470,7 +1470,7 @@ else hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' # Warning - without using the other run time loading flags, -berok will # link without error, but may produce a broken library. - allow_undefined_flag='${wl}-berok" + allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' diff --git a/lib/bind/ltmain.sh b/lib/bind/ltmain.sh index 5959c479b0..96c5835935 100644 --- a/lib/bind/ltmain.sh +++ b/lib/bind/ltmain.sh @@ -725,6 +725,9 @@ compiler." # that all symbols are satisfied, otherwise we get a static library. allow_undefined=yes ;; + *-*-aix*) + allow_undefined=no + ;; *) allow_undefined=yes ;; @@ -940,6 +943,7 @@ compiler." -allow-undefined) # FIXME: remove this flag sometime in the future. $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 + allow_undefined=yes continue ;; diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index fe25f3aed0..5af4806e3a 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.138 2003/09/30 05:56:10 marka Exp $ +# $Id: Makefile.in,v 1.139 2003/10/08 06:36:11 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -30,6 +30,10 @@ CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} CDEFINES = CWARNINGS = +ISCLIBS = ../../lib/isc/libisc.@A@ + +ISCDEPLIBS = ../../lib/isc/libisc.@A@ + LIBS = @LIBS@ # Alphabetically @@ -98,7 +102,7 @@ libdns.la: ${OBJS} ${LIBTOOL} --mode=link \ ${CC} ${ALL_CFLAGS} -o libdns.la -rpath ${libdir} \ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${LIBS} + ${OBJS} ${LIBS} ${ISCLIBS} timestamp: libdns.@A@ touch timestamp diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 6371031772..5dc2d9cd56 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.3 2001/09/20 15:16:56 marka Exp $ +# $Id: Makefile.in,v 1.4 2003/10/08 06:36:12 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -31,7 +31,7 @@ CDEFINES = CWARNINGS = ISCLIBS = ../../lib/isc/libisc.@A@ -ISCCCLIBS = ../../lib/cc/libisccc.@A@ +ISCCCLIBS = ../../lib/isccc/libisccc.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ ISCCCDEPLIBS = libisccc.@A@ @@ -71,7 +71,7 @@ libisccc.la: ${OBJS} ${LIBTOOL} --mode=link \ ${CC} ${ALL_CFLAGS} -o libisccc.la -rpath ${libdir} \ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${LIBS} + ${OBJS} ${LIBS} ${ISCLIBS} timestamp: libisccc.@A@ touch timestamp diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in index 755e3b505f..5b1c2495e9 100644 --- a/lib/isccfg/Makefile.in +++ b/lib/isccfg/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.9 2002/02/20 03:35:47 marka Exp $ +# $Id: Makefile.in,v 1.10 2003/10/08 06:36:12 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -31,6 +31,8 @@ CDEFINES = CWARNINGS = ISCLIBS = ../../lib/isc/libisc.@A@ +ISCCCLIBS = ../../lib/isccc/libisccc.@A@ +DNSLIBS = ../../lib/dns/libdns.@A@ ISCCFGLIBS = ../../lib/cfg/libisccfg.@A@ ISCDEPLIBS = ../../lib/isc/libisc.@A@ @@ -66,7 +68,7 @@ libisccfg.la: ${OBJS} ${LIBTOOL} --mode=link \ ${CC} ${ALL_CFLAGS} -o libisccfg.la -rpath ${libdir} \ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ - ${OBJS} ${LIBS} + ${OBJS} ${LIBS} ${DNSLIBS} ${ISCCCLIBS} ${ISCLIBS} timestamp: libisccfg.@A@ touch timestamp diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index ac007a418c..57f67f6dca 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.15 2001/09/20 15:17:01 marka Exp $ +# $Id: Makefile.in,v 1.16 2003/10/08 06:36:13 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -25,6 +25,12 @@ CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${TEST_INCLUDES} CDEFINES = CWARNINGS = +ISCLIBS = ../../lib/isc/libisc.@A@ +ISCCCLIBS = ../../lib/isccc/libisccc.@A@ + +ISCDEPLIBS = ../../lib/isc/libisc.@A@ +ISCCCDEPLIBS = libisccc.@A@ + OBJS = t_api.@O@ SRCS = t_api.c @@ -41,7 +47,7 @@ libt_api.@SA@: ${OBJS} libt_api.la: ${OBJS} ${LIBTOOL} --mode=link \ ${CC} ${ALL_CFLAGS} -o libt_api.la -rpath ${libdir} \ - ${OBJS} ${LIBS} + ${OBJS} ${LIBS} ${ISCLIBS} timestamp: libt_api.@A@ touch timestamp diff --git a/ltmain.sh b/ltmain.sh index 6e5bf3657c..60784fa005 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -737,6 +737,9 @@ compiler." # that all symbols are satisfied, otherwise we get a static library. allow_undefined=yes ;; + *-*-aix*) + allow_undefined=no + ;; *) allow_undefined=yes ;; @@ -952,6 +955,7 @@ compiler." -allow-undefined) # FIXME: remove this flag sometime in the future. $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 + allow_undefined=yes continue ;;