From e7a3c62a9fc7450d03e136dee2eac1edd8e10a1b Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Fri, 28 Aug 2009 23:35:15 +0000 Subject: Welcome the new Kerberos V 1.7. PR: 138246 --- security/krb5-17/files/patch-config::shlib.conf | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'security/krb5-17/files/patch-config::shlib.conf') diff --git a/security/krb5-17/files/patch-config::shlib.conf b/security/krb5-17/files/patch-config::shlib.conf index 18f91fffc6d5..210d812ede50 100644 --- a/security/krb5-17/files/patch-config::shlib.conf +++ b/security/krb5-17/files/patch-config::shlib.conf @@ -1,6 +1,6 @@ ---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006 -+++ config/shlib.conf Wed Mar 28 17:17:55 2007 -@@ -258,22 +258,15 @@ +--- config/shlib.conf.orig 2008-12-08 14:33:07.000000000 -0800 ++++ config/shlib.conf 2009-08-28 13:27:39.000000000 -0700 +@@ -299,24 +299,17 @@ ;; *-*-freebsd*) @@ -12,8 +12,8 @@ - PICFLAGS=-fpic - if test "x$objformat" = "xelf" ; then + case $krb5_cv_host in -+ sparc64-*) PICFLAGS=-fPIC;; -+ *) PICFLAGS=-fpic;; ++ sparc64-*) PICFLAGS=-fPIC;; ++ *) PICFLAGS=-fpic;; + esac SHLIBVEXT='.so.$(LIBMAJOR)' + LDCOMBINE="libtool --mode=link cc -shared" @@ -22,9 +22,11 @@ - RPATH_FLAG=-R - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - fi - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' -- cgit v1.2.3