[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Jun 30 15:26:26 CDT 2011
branch "master" has been updated
via 244f67303ae72659516ec63cc6046a755067c207 (commit)
via cb52eb3c02ed74e61b05906858cdb5beb430565b (commit)
from 888bab69a54d2ba61120a07a9ac2b0f93e67fa1c (commit)
Summary of changes:
cmake/AsteriskSCF.cmake | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
- Log -----------------------------------------------------------------
commit 244f67303ae72659516ec63cc6046a755067c207
Merge: 888bab6 cb52eb3
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 30 15:26:21 2011 -0500
Merge branch 'master' of git://git.asterisk.org/asterisk-scf/release/cmake
commit cb52eb3c02ed74e61b05906858cdb5beb430565b
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 30 15:24:50 2011 -0500
Explicitly link components to libpthread on UNIX-type platforms.
Fedora 14 and later require libraries and executables to be explicitly
linked to all libraries they use; since most of our components use pthread
facilities directly, they will now be linked to that library.
(closes issue ASTSCF-207)
diff --git a/AsteriskSCF.cmake b/AsteriskSCF.cmake
index 64a5ccb..0e13f2c 100644
--- a/AsteriskSCF.cmake
+++ b/AsteriskSCF.cmake
@@ -921,6 +921,14 @@ endfunction()
# Function which collects libraries needed by a component
function(__astscf_component_libraries COMPONENT)
+ # On UNIX-type platforms, pretty much every component that gets built
+ # will end up using the pthread library; on Fedora 14 and later, this
+ # requirement is *not* satisfied by linking to other libraries that
+ # also link to libpthread; instead, the component must be explicitly
+ # linked to libpthread
+ if(UNIX)
+ list(APPEND target_libs "pthread")
+ endif()
list(APPEND icelibs ${ASTSCF_ICE_LIBRARIES} ${${COMPONENT}_ICE_LIBRARIES})
list(REMOVE_DUPLICATES icelibs)
foreach(lib ${icelibs})
-----------------------------------------------------------------------
--
asterisk-scf/integration/gitall.git
More information about the asterisk-scf-commits
mailing list