From d8ed090f29a4e455266483f2e09bb9380425f86d Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 19 Mar 2008 10:31:25 +0100 Subject: - Fixed bug 2843 - Cleaned up platform specific Make.rules files to not set anymore the shared library path since it's taken care of by Make.rules.common already. - Fixed bug 2846 --- cpp/INSTALL.MACOSX | 4 ++-- cpp/config/Make.rules.AIX | 5 ----- cpp/config/Make.rules.Darwin | 14 +------------- cpp/config/Make.rules.FreeBSD | 5 ----- cpp/config/Make.rules.HP-UX | 13 ------------- cpp/config/Make.rules.Linux | 5 ----- cpp/config/Make.rules.OSF1 | 6 ------ cpp/config/Make.rules.SunOS | 13 ------------- cpp/src/Ice/EndpointI.cpp | 13 ++++++++++--- 9 files changed, 13 insertions(+), 65 deletions(-) (limited to 'cpp') diff --git a/cpp/INSTALL.MACOSX b/cpp/INSTALL.MACOSX index 8e56d3322bb..5203c62d5fc 100644 --- a/cpp/INSTALL.MACOSX +++ b/cpp/INSTALL.MACOSX @@ -7,14 +7,14 @@ Operating System ---------------- Ice is expected to build and run properly on any recent Mac OS X -version. However, Ice is officially supported only on Mac OS X 10.4.x. +version. However, Ice is officially supported only on Mac OS X 10.5.x. C++ compiler ------------ Ice is expected to build properly with GCC 3.3 or later. However, only -the GCC 4.0.1 compiler is officially supported on Mac OS X 10.4.x. +the GCC 4.0.1 compiler is officially supported on Mac OS X 10.5.x. Third-party libraries diff --git a/cpp/config/Make.rules.AIX b/cpp/config/Make.rules.AIX index 3bc422fdc43..c38c8d30756 100644 --- a/cpp/config/Make.rules.AIX +++ b/cpp/config/Make.rules.AIX @@ -78,8 +78,3 @@ LIBS = -lIce $(BASELIBS) ICEUTIL_OS_LIBS = ICE_OS_LIBS = -ifdef ice_src_dist - export LIBPATH := $(libdir):$(LIBPATH) -else - export LIBPATH := $(ice_dir)/$(libsubdir):$(LIBPATH) -endif diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index c789f45308f..95f8ec63be9 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -59,20 +59,13 @@ ifeq ($(DB_HOME),) # but in the ICE_DIR/lib directory, we set DB_RPATH_LINK to tell the linker where # to find it. # - ifdef ice_src_dist - ifeq ($(shell test -f $(libdir)/libFreeze.$(VERSION).dylib && echo 0),0) - dblib_install_name=$(firstword $(strip $(shell otool -L $(libdir)/libFreeze.$(VERSION).dylib | grep libdb_cxx))) - ifeq ($(shell test ! -f $(dblib_install_name) -a -f $(libdir)/$(notdir $(dblib_install_name)) && echo 0),0) - DB_RPATH_LINK=-dylib_file $(dblib_install_name):$(libdir)/$(notdir $(dblib_install_name)) - endif - endif + ifndef ice_src_dist ifeq ($(shell test -f $(ice_dir)/$(libsubdir)/libFreeze.$(VERSION).dylib && echo 0),0) dblib_install_name=$(firstword $(strip $(shell otool -L $(ice_dir)/$(libsubdir)/libFreeze.$(VERSION).dylib | grep libdb_cxx))) ifeq ($(shell test ! -f $(dblib_install_name) -a -f $(ice_dir)/$(libsubdir)/$(notdir $(dblib_install_name)) && echo 0),0) DB_RPATH_LINK=-dylib_file $(dblib_install_name):$(ice_dir)/$(libsubdir)/$(notdir $(dblib_install_name)) endif endif - else endif endif @@ -87,8 +80,3 @@ ICONV_LIB = -liconv PLATFORM_HAS_READLINE := no -ifdef ice_src_dist - export DYLD_LIBRARY_PATH := $(libdir):$(DYLD_LIBRARY_PATH) -else - export DYLD_LIBRARY_PATH := $(ice_dir)/$(libsubdir):$(DYLD_LIBRARY_PATH) -endif diff --git a/cpp/config/Make.rules.FreeBSD b/cpp/config/Make.rules.FreeBSD index 9bff466fe31..e10a8876df0 100644 --- a/cpp/config/Make.rules.FreeBSD +++ b/cpp/config/Make.rules.FreeBSD @@ -49,8 +49,3 @@ ICE_OS_LIBS = PLATFORM_HAS_READLINE = yes -ifdef ice_src_dist - export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) -else - export LD_LIBRARY_PATH := $(ice_dir)/$(libsubdir):$(LD_LIBRARY_PATH) -endif diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX index 672e5b523c3..c6104e054a8 100644 --- a/cpp/config/Make.rules.HP-UX +++ b/cpp/config/Make.rules.HP-UX @@ -78,16 +78,3 @@ ICE_OS_LIBS = -lipv6 lp64suffix = /pa20_64 lp64binsuffix = /pa20_64 -ifeq ($(LP64),yes) - ifdef ice_src_dist - export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) - else - export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) - endif -else - ifdef ice_src_dist - export SHLIB_PATH := $(ice_dir)/$(libsubdir):$(SHLIB_PATH) - else - export SHLIB_PATH := $(ice_dir)/$(libsubdir):$(SHLIB_PATH) - endif -endif diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux index 087db574dd1..6243b72efd8 100644 --- a/cpp/config/Make.rules.Linux +++ b/cpp/config/Make.rules.Linux @@ -173,8 +173,3 @@ ICE_OS_LIBS = -ldl PLATFORM_HAS_READLINE = yes -ifdef ice_src_dist - export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) -else - export LD_LIBRARY_PATH := $(ice_dir)/$(libsubdir):$(LD_LIBRARY_PATH) -endif diff --git a/cpp/config/Make.rules.OSF1 b/cpp/config/Make.rules.OSF1 index 48346fa3c94..90b43809a7e 100644 --- a/cpp/config/Make.rules.OSF1 +++ b/cpp/config/Make.rules.OSF1 @@ -78,9 +78,3 @@ LIBS = -lIce $(BASELIBS) ICEUTIL_OS_LIBS = -lrt ICE_OS_LIBS = - -ifdef ice_src_dist - export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) -else - export LD_LIBRARY_PATH := $(ice_dir)/$(libsubdir):$(LD_LIBRARY_PATH) -endif diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index f9e683369e8..c2f2ab1faef 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -162,16 +162,3 @@ ifeq ($(MACHINE_TYPE),i86pc) lp64binsuffix = /amd64 endif -ifeq ($(LP64),yes) - ifdef ice_src_dist - export LD_LIBRARY_PATH_64 := $(libdir):$(LD_LIBRARY_PATH_64) - else - export LD_LIBRARY_PATH_64 := $(ice_dir)/$(libsubdir):$(LD_LIBRARY_PATH_64) - endif -else - ifdef ice_src_dist - export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) - else - export LD_LIBRARY_PATH := $(ice_dir)/$(libsubdir):$(LD_LIBRARY_PATH) - endif -endif diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index 3341cccf8b2..a9e3832de70 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -109,9 +109,16 @@ IceInternal::EndpointHostResolver::run() _queue.pop_front(); } - resolve.callback->connectors( - resolve.endpoint->connectors( - getAddresses(resolve.host, resolve.port, _instance->protocolSupport(), true))); + try + { + resolve.callback->connectors( + resolve.endpoint->connectors( + getAddresses(resolve.host, resolve.port, _instance->protocolSupport(), true))); + } + catch(const Ice::LocalException& ex) + { + resolve.callback->exception(ex); + } } for(deque::const_iterator p = _queue.begin(); p != _queue.end(); ++p) -- cgit v1.2.3