Author: cliffjansen
Date: Thu Feb 9 17:40:14 2012
New Revision: 1242411
URL: http://svn.apache.org/viewvc?rev=1242411&view=rev
Log:
QPID-3621 cmake build changes for solaris and solaris specific code changes
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/cluster.cmake
qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt
qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
qpid/trunk/qpid/cpp/src/rdma.cmake
qpid/trunk/qpid/cpp/src/ssl.cmake
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1242411&r1=1242410&r2=1242411&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Feb 9 17:40:14 2012
@@ -269,6 +269,12 @@ if (CMAKE_COMPILER_IS_GNUCXX)
# -Wshadow - warns about boost headers.
set (WARNING_FLAGS
"-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith
-Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch
-Wno-system-headers -Woverloaded-virtual")
+
+ set (GCC_CATCH_UNDEFINED "-Wl,--no-undefined")
+ # gcc on SunOS uses native linker whose "-z defs" is too fussy
+ if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+ set (GCC_CATCH_UNDEFINED "")
+ endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
endif (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
@@ -546,7 +552,7 @@ if (BUILD_XML)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties (xml PROPERTIES
PREFIX ""
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS ${GCC_CATCH_UNDEFINED})
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS xml
DESTINATION ${QPIDD_MODULE_DIR}
@@ -581,7 +587,7 @@ if (BUILD_ACL)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties (acl PROPERTIES
PREFIX ""
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS acl
DESTINATION ${QPIDD_MODULE_DIR}
@@ -706,23 +712,28 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
add_definitions(-pthread)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
if (CMAKE_COMPILER_IS_GNUCXX)
- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
-Wl,--no-undefined -pthread")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
${GCC_CATCH_UNDEFINED} -pthread")
endif (CMAKE_COMPILER_IS_GNUCXX)
endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
- if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
- set (qpid_poller_module
- qpid/sys/solaris/ECFPoller.cpp
- qpid/sys/solaris/SystemInfo.cpp
- )
- endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
-
set (qpidtypes_platform_SOURCES)
set (qpidtypes_platform_LIBS
uuid
${Boost_SYSTEM_LIBRARY}
)
+ if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+ set (qpid_poller_module
+ qpid/sys/posix/PosixPoller.cpp
+ qpid/sys/solaris/SystemInfo.cpp
+ )
+# On Sun we want -lpthread -lthread as the 2nd last and last libs passed to
linker
+ set (qpidtypes_platform_LIBS ${qpidtypes_platform_LIBS}
+ pthread
+ thread
+ )
+ endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+
set (qpidcommon_platform_SOURCES
qpid/sys/posix/AsynchIO.cpp
qpid/sys/posix/Fork.cpp
@@ -1318,7 +1329,7 @@ target_link_libraries (replicating_liste
set_target_properties (replicating_listener PROPERTIES PREFIX "")
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(replicating_listener PROPERTIES
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS replicating_listener
DESTINATION ${QPIDD_MODULE_DIR}
@@ -1339,7 +1350,7 @@ target_link_libraries (replication_excha
set_target_properties (replication_exchange PROPERTIES PREFIX "")
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(replication_exchange PROPERTIES
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS replication_exchange
DESTINATION ${QPIDD_MODULE_DIR}
Modified: qpid/trunk/qpid/cpp/src/cluster.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/cluster.cmake?rev=1242411&r1=1242410&r2=1242411&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/cluster.cmake (original)
+++ qpid/trunk/qpid/cpp/src/cluster.cmake Thu Feb 9 17:40:14 2012
@@ -154,7 +154,7 @@ if (BUILD_CLUSTER)
# Turn off optimisation based on strict-aliasing because we get warnings
about violations
set_target_properties(cluster cluster_shared PROPERTIES
COMPILE_FLAGS "-fno-strict-aliasing"
- LINK_FLAGS "-Wl,--no-undefined -pthread")
+ LINK_FLAGS "${GCC_CATCH_UNDEFINED} -pthread")
endif (CMAKE_COMPILER_IS_GNUCXX)
add_library (watchdog MODULE qpid/cluster/WatchDogPlugin.cpp)
Modified: qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt?rev=1242411&r1=1242410&r2=1242411&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/qpid/store/CMakeLists.txt Thu Feb 9 17:40:14 2012
@@ -34,9 +34,15 @@ set (store_SOURCES
add_library (store MODULE ${store_SOURCES})
target_link_libraries (store qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY})
if (CMAKE_COMPILER_IS_GNUCXX)
+ set (GCC_CATCH_UNDEFINED "-Wl,--no-undefined")
+ # gcc on SunOS uses native linker whose "-z defs" is too fussy
+ if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+ set (GCC_CATCH_UNDEFINED "")
+ endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+
set_target_properties (store PROPERTIES
PREFIX ""
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
endif (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp?rev=1242411&r1=1242410&r2=1242411&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp Thu Feb 9
17:40:14 2012
@@ -84,8 +84,8 @@ std::string SocketAddress::asString(::so
uint16_t SocketAddress::getPort(::sockaddr const * const addr)
{
switch (addr->sa_family) {
- case AF_INET: return ntohs(((::sockaddr_in*)addr)->sin_port);
- case AF_INET6: return ntohs(((::sockaddr_in6*)addr)->sin6_port);
+ case AF_INET: return ntohs(((::sockaddr_in*)(void*)addr)->sin_port);
+ case AF_INET6: return ntohs(((::sockaddr_in6*)(void*)addr)->sin6_port);
default:throw Exception(QPID_MSG("Unexpected socket type"));
}
}
@@ -112,8 +112,8 @@ void SocketAddress::setAddrInfoPort(uint
::addrinfo& ai = *currentAddrInfo;
switch (ai.ai_family) {
- case AF_INET: ((::sockaddr_in*)ai.ai_addr)->sin_port = htons(port); return;
- case AF_INET6:((::sockaddr_in6*)ai.ai_addr)->sin6_port = htons(port);
return;
+ case AF_INET: ((::sockaddr_in*)(void*)ai.ai_addr)->sin_port = htons(port);
return;
+ case AF_INET6:((::sockaddr_in6*)(void*)ai.ai_addr)->sin6_port =
htons(port); return;
default: throw Exception(QPID_MSG("Unexpected socket type"));
}
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp?rev=1242411&r1=1242410&r2=1242411&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp Thu Feb 9 17:40:14
2012
@@ -69,7 +69,12 @@ void SystemInfo::getLocalIpAddresses(uin
if (::ioctl(s, SIOCGIFADDR, &ifr) < 0) {
break;
}
- struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.lifr_addr;
+ struct sockaddr *sa = static_cast<struct sockaddr *>((void *)
&ifr.lifr_addr);
+ if (sa->sa_family != AF_INET) {
+ // TODO: Url parsing currently can't cope with IPv6 addresses,
defer for now
+ break;
+ }
+ struct sockaddr_in *sin = static_cast<struct sockaddr_in *>((void
*)sa);
std::string addr(inet_ntoa(sin->sin_addr));
if (addr != LOCALHOST)
addrList.push_back(Address(TCP, addr, port));
Modified: qpid/trunk/qpid/cpp/src/rdma.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/rdma.cmake?rev=1242411&r1=1242410&r2=1242411&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/rdma.cmake (original)
+++ qpid/trunk/qpid/cpp/src/rdma.cmake Thu Feb 9 17:40:14 2012
@@ -68,7 +68,7 @@ if (BUILD_RDMA)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(rdmawrap PROPERTIES
COMPILE_FLAGS -Wno-missing-field-initializers
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS ${GCC_CATCH_UNDEFINED})
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS rdmawrap
@@ -83,7 +83,7 @@ if (BUILD_RDMA)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(rdma PROPERTIES
COMPILE_FLAGS -Wno-missing-field-initializers
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS ${GCC_CATCH_UNDEFINED})
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS rdma
@@ -98,7 +98,7 @@ if (BUILD_RDMA)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(rdmaconnector PROPERTIES
COMPILE_FLAGS -Wno-missing-field-initializers
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS ${GCC_CATCH_UNDEFINED})
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS rdmaconnector
Modified: qpid/trunk/qpid/cpp/src/ssl.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/ssl.cmake?rev=1242411&r1=1242410&r2=1242411&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/ssl.cmake (original)
+++ qpid/trunk/qpid/cpp/src/ssl.cmake Thu Feb 9 17:40:14 2012
@@ -97,7 +97,7 @@ if (BUILD_SSL)
COMPILE_FLAGS ${NSS_COMPILE_FLAGS})
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(ssl PROPERTIES
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS ssl
@@ -111,7 +111,7 @@ if (BUILD_SSL)
COMPILE_FLAGS ${NSS_COMPILE_FLAGS})
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(sslconnector PROPERTIES
- LINK_FLAGS -Wl,--no-undefined)
+ LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS sslconnector
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
