From: Simon Wilkinson Date: Wed, 12 Sep 2012 09:20:43 +0000 (+0100) Subject: libafs*: Don't re-export opr/util functions X-Git-Tag: upstream/1.8.0_pre1^2~1997 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ba043e11022e87fae3fd04fd55c223aae788463b;p=packages%2Fo%2Fopenafs.git libafs*: Don't re-export opr/util functions On Solaris, a library can't re-export functions which come from one of its dependencies - so libafsrpc can't easily republish the 5 opr functions that are currently in the libafsrpc map file. Including the bits of the opr library that define these functions causes problems with then linking libafsrpc against libopr, which we do in a number of places. libafsauthent has exactly the same problem, with a few symbols that it pulls in from util. The affected symbols were all added relatively recently, and have limited uses outside of the OpenAFS tree, so just remove them from the export list so we are one step closer to building on Solaris again. Change-Id: If0a1105320e416ebc013ff670dddd5d247b06f6b Reviewed-on: http://gerrit.openafs.org/8102 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/libafsauthent/libafsauthent.la.sym b/src/libafsauthent/libafsauthent.la.sym index 369805bf5..9a7bdfb63 100644 --- a/src/libafsauthent/libafsauthent.la.sym +++ b/src/libafsauthent/libafsauthent.la.sym @@ -56,12 +56,7 @@ ubik_ClientDestroy ubik_ClientInit ubik_ParseClientList pioctl -getDirPath ka_AuthSpecificServersConn -pthread_recursive_mutex_lock -pthread_recursive_mutex_unlock -grmutex -initAFSDirPath pr_GetCPS pr_Initialize pr_GetHostCPS @@ -72,4 +67,3 @@ pr_End pr_SNameToId afs_get_pag_from_groups setpag -LogThreadNum diff --git a/src/libafsrpc/libafsrpc.la.sym b/src/libafsrpc/libafsrpc.la.sym index 740de1317..d0b4f5ef6 100644 --- a/src/libafsrpc/libafsrpc.la.sym +++ b/src/libafsrpc/libafsrpc.la.sym @@ -101,11 +101,6 @@ RXSTATS_ClearProcessRPCStats RXSTATS_ClearPeerRPCStats TM_GetTimeOfDay FT_GetTimeOfDay -opr_strcompose -opr_stolower -opr_ucstring -opr_lcstring -opr_AssertionFailed rx_GetLocalPeers rx_GetMaxReceiveWindow rx_GetMaxSendWindow