[105939] trunk/dports/net/kerberos5
cal at macports.org
cal at macports.org
Fri May 10 16:39:20 PDT 2013
Revision: 105939
https://trac.macports.org/changeset/105939
Author: cal at macports.org
Date: 2013-05-10 16:39:20 -0700 (Fri, 10 May 2013)
Log Message:
-----------
kerberos5: update to 1.11.2, attempt to fix #38985 by not relying on CPATH anymore
Modified Paths:
--------------
trunk/dports/net/kerberos5/Portfile
Added Paths:
-----------
trunk/dports/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff
Modified: trunk/dports/net/kerberos5/Portfile
===================================================================
--- trunk/dports/net/kerberos5/Portfile 2013-05-10 23:25:46 UTC (rev 105938)
+++ trunk/dports/net/kerberos5/Portfile 2013-05-10 23:39:20 UTC (rev 105939)
@@ -5,9 +5,9 @@
PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
-github.setup krb5 krb5 1.11.1-final krb5-
+github.setup krb5 krb5 1.11.2-final krb5-
name kerberos5
-version 1.11.1
+version 1.11.2
conflicts fbopenssl
set branch [join [lrange [split ${version} .] 0 1] .]
categories net security
@@ -26,21 +26,23 @@
Technology. Kerberos is available in many commercial \
products as well.
-checksums rmd160 162524644e39dfd86d1b97b70230e00ad885e7d0 \
- sha256 7a975c0a88375a9a1362b45cfd70bec34ff839ca75a532dffc76d832d4ca3514
+checksums rmd160 ec13cb9ff9ea297e5c8a66b6803b2f3d303406cd \
+ sha256 e72e622e8d9609b63d3e80e13bc9c3bbd35b7ae13fe8a116792abb102e12bdb5
depends_lib port:openssl \
port:libcomerr \
port:libedit
-worksrcdir krb5-krb5-da9dc1b/src
+worksrcdir krb5-krb5-cdddd9c/src
-patchfiles patch-util__verto__Makefile.in-use-nonzero-compat-version.diff
+patchfiles patch-util__verto__Makefile.in-use-nonzero-compat-version.diff \
+ patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff
use_autoreconf yes
-# kerberos5 fails to build in its own presence, see #23769, #37944
-configure.cppflags-delete -I${prefix}/include
+# kerberos5 fails to build in its own presence, see #23769, #37944; force
+# linking against its own libs first
configure.ldflags-delete -L${prefix}/lib
+configure.ldflags-append -L${worksrcpath}/lib -L${prefix}/lib
configure.args --mandir=${prefix}/share/man \
--with-system-et \
--without-system-db \
@@ -55,7 +57,7 @@
--without-system-ss
# configure fails using clang-77 from XCode 3.2.6
-compiler.blacklist-append {clang < 137}
+compiler.blacklist-append {clang < 137}
# i386 linking fails on SL with gcc-4.2 from XCode 3.2.6
if {[lsearch ${universal_archs} i386] != -1} {
Added: trunk/dports/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff
===================================================================
--- trunk/dports/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff (rev 0)
+++ trunk/dports/net/kerberos5/files/patch-config__shlib.conf-do-not-pass-dylib-file-ldflags.diff 2013-05-10 23:39:20 UTC (rev 105939)
@@ -0,0 +1,19 @@
+--- config/shlib.conf.orig 2013-05-11 00:26:52.000000000 +0200
++++ config/shlib.conf 2013-05-11 00:27:08.000000000 +0200
+@@ -359,15 +359,7 @@
+ DYNOBJEXT=.so
+ SHLIB_EXPORT_FILE_DEP=darwin.exports
+ LDCOMBINE='$(CC) -undefined error -dead_strip -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/$(LIBPREFIX)$(LIBBASE)$(SHLIBVEXT)" -exported_symbols_list darwin.exports $(CFLAGS)'
+- # The -dylib_file option tells the linker where to find indirect dependent
+- # libraries, without adding them to the dependency list. We need this because
+- # the direct dependent libraries contain the pathname where the indirect
+- # dependent libraries will be installed (but haven't been yet).
+- LDCOMBINE_TAIL=""
+- 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='$(CC) -bundle $(CFLAGS) $(LDFLAGS) -o $@ $$objlist $(DYNOBJ_EXPFLAGS) $(LDFLAGS) -exported_symbols_list darwin.exports'
+ 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)'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130510/d66f69d8/attachment.html>
More information about the macports-changes
mailing list