491d6a5a3b
including MITKRB5-SA-2011-003. Please see http://web.mit.edu/kerberos/ for the change logs since v1.4.2 Note that the r-services, telnetd and ftpd services and the related client applications are now in a separate pacakge security/mit-krb5-appl.
77 lines
4 KiB
Text
77 lines
4 KiB
Text
$NetBSD: patch-ag,v 1.6 2011/03/22 23:31:04 tez Exp $
|
|
|
|
Add --enable-pkgsrc-libtool option
|
|
|
|
--- config/shlib.conf.orig Mon Feb 8 14:55:48 2010
|
|
+++ config/shlib.conf Thu Jan 6 15:14:39 2011
|
|
@@ -22,6 +22,7 @@
|
|
SHLIBSEXT=.so.s-nobuild
|
|
# Most systems support profiled libraries.
|
|
PFLIBEXT=_p.a
|
|
+LALIBEXT=.la
|
|
# Most systems install shared libs as mode 644, etc. while hpux wants 755
|
|
INSTALL_SHLIB='$(INSTALL_DATA)'
|
|
# Most systems use the same objects for shared libraries and dynamically
|
|
@@ -37,6 +38,7 @@
|
|
STOBJEXT=.o
|
|
SHOBJEXT=.so
|
|
PFOBJEXT=.po
|
|
+LAOBJEXT=.lo
|
|
# Default for systems w/o shared libraries
|
|
CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
|
|
CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
|
|
@@ -281,7 +283,7 @@
|
|
PROFFLAGS=-pg
|
|
;;
|
|
|
|
-*-*-netbsd*)
|
|
+*-*-netbsd* | *-*-dragonfly*)
|
|
PICFLAGS=-fPIC
|
|
SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
|
|
SHLIBEXT=.so
|
|
@@ -358,7 +360,7 @@
|
|
for lib in libkrb5support.1.1.dylib libkadm5srv.5.1.dylib libkdb5.4.0.dylib; do
|
|
LDCOMBINE_TAIL="$LDCOMBINE_TAIL -dylib_file \"\$(KRB5_LIBDIR)/$lib\":\$(TOPLIBD)/$lib"
|
|
done
|
|
- MAKE_DYNOBJ_COMMAND='$(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}"
|
|
+ MAKE_DYNOBJ_COMMAND='${LIBTOOL} --mode=link $(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'" ${LDCOMBINE_TAIL}"
|
|
CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
|
|
CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
|
|
CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -dynamic $(CXXFLAGS) $(LDFLAGS)'
|
|
@@ -473,7 +475,7 @@
|
|
# Assume initialization always delayed.
|
|
INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
|
|
use_linker_fini_option=yes
|
|
- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"
|
|
+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}"
|
|
RPATH_TAIL=:/usr/lib:/lib
|
|
PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"
|
|
CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
|
|
@@ -509,8 +511,8 @@
|
|
# Assume initialization always delayed.
|
|
INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'
|
|
use_linker_fini_option=yes
|
|
- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)'
|
|
- MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE_DYN}"
|
|
+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE}"' && ar cq $@ shr.o.$(LIBMAJOR).$(LIBMINOR) && chmod +x $@ && rm -f shr.o.$(LIBMAJOR).$(LIBMINOR)'
|
|
+ MAKE_DYNOBJ_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE_DYN}"
|
|
RPATH_TAIL=:/usr/lib:/lib
|
|
PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"
|
|
CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
|
|
@@ -524,8 +526,14 @@
|
|
|
|
if test "${MAKE_SHLIB_COMMAND}" = "x" ; then
|
|
if test "${INIT_FINI_PREP}" != ":"; then
|
|
- MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
|
|
+ MAKE_SHLIB_COMMAND="${INIT_FINI_PREP} && ${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
|
|
else
|
|
- MAKE_SHLIB_COMMAND="${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
|
|
+ MAKE_SHLIB_COMMAND="${LIBTOOL} --mode=link ${LDCOMBINE} -o \$@ \$\$objlist \$(SHLIB_EXPFLAGS) \$(LDFLAGS) ${LDCOMBINE_TAIL}"
|
|
fi
|
|
fi
|
|
+
|
|
+# Settings for building with pkgsrc libtool.
|
|
+CC_LINK_LIBTOOL='$(LIBTOOL) --mode=link '"$CC_LINK_SHARED"
|
|
+LALIB_EXPFLAGS='$(SHLIB_EXPFLAGS)'
|
|
+LIBTOOL_TAIL='-rpath $(KRB5_LIBDIR) -version-info $(LIBMAJOR):$(LIBMINOR)'
|
|
+INSTALL_SHLIB='$(INSTALL)'
|