diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-28 17:31:59 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-28 17:31:59 +0000 |
| commit | 0925dae118eedae89bc971b11633050b65aebd9b (patch) | |
| tree | c7288668bde695bc73a80f5e35a410884ff7cfa6 /security/krb5-17 | |
| parent | - Update to 0.9.781 (diff) | |
- Fix after objformat removal
Reported by: pointyhat
Notes
Notes:
svn path=/head/; revision=188681
Diffstat (limited to 'security/krb5-17')
| -rw-r--r-- | security/krb5-17/files/patch-config::shlib.conf | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/security/krb5-17/files/patch-config::shlib.conf b/security/krb5-17/files/patch-config::shlib.conf index 272865fd23dc..18f91fffc6d5 100644 --- a/security/krb5-17/files/patch-config::shlib.conf +++ b/security/krb5-17/files/patch-config::shlib.conf @@ -1,23 +1,27 @@ ---- config/shlib.conf.orig Thu Apr 7 14:38:55 2005 -+++ config/shlib.conf Wed Nov 23 16:32:40 2005 -@@ -238,17 +238,21 @@ - else - objformat="aout" - fi +--- 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 @@ + ;; + + *-*-freebsd*) +- if test -x /usr/bin/objformat ; then +- objformat=`/usr/bin/objformat` +- else +- objformat="aout" +- fi - PICFLAGS=-fpic +- if test "x$objformat" = "xelf" ; then + case $krb5_cv_host in + sparc64-*) PICFLAGS=-fPIC;; + *) PICFLAGS=-fpic;; + esac - if test "x$objformat" = "xelf" ; then SHLIBVEXT='.so.$(LIBMAJOR)' + LDCOMBINE="libtool --mode=link cc -shared" RPATH_FLAG='-Wl,-rpath -Wl,' - else -+ LDCOMBINE='ld -Bshareable' - RPATH_FLAG=-R - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - fi +- else +- RPATH_FLAG=-R +- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' +- fi CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so - LDCOMBINE='ld -Bshareable' |