diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2010-04-26 03:23:08 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2010-04-26 03:23:08 +0000 |
| commit | 3c82bcd5d831047f62cbf8467c442604c981bf10 (patch) | |
| tree | 55143bc4e6c6146b4aceb2749fff01f119e90aaf /security/krb5/files/patch-config::shlib.conf | |
| parent | - Update to 201017 (diff) | |
MFkrb5-17.
Notes
Notes:
svn path=/head/; revision=253260
Diffstat (limited to 'security/krb5/files/patch-config::shlib.conf')
| -rw-r--r-- | security/krb5/files/patch-config::shlib.conf | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/security/krb5/files/patch-config::shlib.conf b/security/krb5/files/patch-config::shlib.conf index 5d680b5487ca..c8a3d391a103 100644 --- a/security/krb5/files/patch-config::shlib.conf +++ b/security/krb5/files/patch-config::shlib.conf @@ -1,6 +1,6 @@ ---- config/shlib.conf.orig 2009-07-13 14:48:25.000000000 +0200 -+++ config/shlib.conf 2009-07-13 14:49:49.000000000 +0200 -@@ -258,19 +258,13 @@ +--- 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,16 +12,21 @@ - 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 -Xcompiler -shared" RPATH_FLAG='-Wl,-rpath -Wl,' - else - 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' +- LDCOMBINE='ld -Bshareable' + SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' |