diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index e820bc0..10f0b9f 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -11,10 +11,12 @@ # This file is included by Make.rules when uname is Darwin. # +OSX_TARGET_MIN_SDK_VERSION = 10.8 + CXX = xcrun clang++ -CPPFLAGS += -pthread -CXXFLAGS += -Wall -Werror +CPPFLAGS += -pthread +CXXFLAGS += -Wall -Werror -mmacosx-version-min=$(OSX_TARGET_MIN_SDK_VERSION) ifeq ($(OPTIMIZE),yes) # @@ -66,11 +68,6 @@ curdir = $(shell pwd) mkshlib = $(CXX) -dynamiclib $(shlibldflags) -o $(1) -install_name @rpath/$(2) $(3) $(4) -# -# Avoid OpenSSL deprecation warnings on OS X -# -OPENSSL_FLAGS = -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_6 - BASELIBS = -lIceUtil LIBS = -lIce $(BASELIBS) diff --git a/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp index 1a437a6..34ced20 100644 --- a/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp +++ b/cpp/src/Glacier2/CryptPermissionsVerifierI.cpp @@ -10,6 +10,11 @@ #include #include +// Ignore OS X OpenSSL deprecation warnings +#ifdef __APPLE__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + using namespace std; using namespace Ice; using namespace Glacier2; diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h index 6080cf3..85fa892 100644 --- a/cpp/src/IceGrid/DescriptorHelper.h +++ b/cpp/src/IceGrid/DescriptorHelper.h @@ -247,7 +247,6 @@ public: ServerInstanceHelper(const ServerInstanceDescriptor&, const Resolver&, bool); ServerInstanceHelper(const ServerDescriptorPtr&, const Resolver&, bool); - void operator=(const ServerInstanceHelper&); bool operator==(const ServerInstanceHelper&) const; bool operator!=(const ServerInstanceHelper&) const; @@ -265,7 +264,7 @@ private: void init(const ServerDescriptorPtr&, const Resolver&, bool); - const ServerInstanceDescriptor _def; + ServerInstanceDescriptor _def; std::string _id; ServerInstanceDescriptor _instance; diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 3c6128e..d31f19b 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -44,6 +44,11 @@ #include +// Ignore OS X OpenSSL deprecation warnings +#ifdef __APPLE__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + using namespace std; using namespace Ice; using namespace IceGrid; diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 576c888..2bad50e 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -34,6 +34,11 @@ #include +// Ignore OS X OpenSSL deprecation warnings +#ifdef __APPLE__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + const char* IcePatch2::checksumFile = "IcePatch2.sum"; const char* IcePatch2::logFile = "IcePatch2.log"; diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp index ace4e11..5756d0c 100644 --- a/cpp/src/IceSSL/Certificate.cpp +++ b/cpp/src/IceSSL/Certificate.cpp @@ -19,6 +19,11 @@ #include #include +// Ignore OS X OpenSSL deprecation warnings +#ifdef __APPLE__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #ifdef __SUNPRO_CC // diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp index eb2ae99..8f4bd4f 100644 --- a/cpp/src/IceSSL/Instance.cpp +++ b/cpp/src/IceSSL/Instance.cpp @@ -34,6 +34,11 @@ #include +// Ignore OS X OpenSSL deprecation warnings +#ifdef __APPLE__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + using namespace std; using namespace Ice; using namespace IceSSL; diff --git a/cpp/src/IceSSL/TransceiverI.cpp b/cpp/src/IceSSL/TransceiverI.cpp index c170291..962828a 100644 --- a/cpp/src/IceSSL/TransceiverI.cpp +++ b/cpp/src/IceSSL/TransceiverI.cpp @@ -25,6 +25,11 @@ #include #include +// Ignore OS X OpenSSL deprecation warnings +#ifdef __APPLE__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + using namespace std; using namespace Ice; using namespace IceSSL; diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 1eb1c51..0a4c9fb 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -27,6 +27,11 @@ #include +// Ignore OS X OpenSSL deprecation warnings +#ifdef __APPLE__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + using namespace std; using namespace Ice; using namespace IceSSL; diff --git a/py/config/Make.rules b/py/config/Make.rules index 43ce01b..5fa5c3c 100644 --- a/py/config/Make.rules +++ b/py/config/Make.rules @@ -134,7 +134,6 @@ ifneq ($(embedded_runpath_prefix),) runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) endif -CPPFLAGS = ICECPPFLAGS = -I$(slicedir) SLICE2PYFLAGS = $(ICECPPFLAGS) LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) diff --git a/py/config/Make.rules.Darwin b/py/config/Make.rules.Darwin index e8e7c4a..5653b83 100644 --- a/py/config/Make.rules.Darwin +++ b/py/config/Make.rules.Darwin @@ -14,7 +14,7 @@ include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME) shlibldflags += -Wl,-rpath,$(embedded_runpath_prefix)/$(libsubdir) -mksoname = $(if $(2),lib$(1).$(2).so,lib$(1).so) +mksoname = $(if $(2),lib$(1).$(2).so,lib$(1).so) mklibname = lib$(1).so # @@ -24,12 +24,11 @@ ifneq ($(PYTHON_HOME),) ifeq ($(shell test ! -f $(PYTHON_HOME)/Python && echo 0),0) $(error Unable to find Python framework See config/Make.rules.Darwin) endif - PYTHON_LIBS = -F$(patsubst %/Python.framework/Versions/,%,$(dir $(PYTHON_HOME))) -framework Python else XCODE_PATH = $(shell xcode-select --print-path) SDKS_DIR = $(XCODE_PATH)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk PYTHON_HOME = $(SDKS_DIR)/System/Library/Frameworks/Python.framework/Versions/Current - PYTHON_LIBS = -framework Python endif +PYTHON_LIBS = -F$(patsubst %/Python.framework/Versions/,%,$(dir $(PYTHON_HOME))) -framework Python PYTHON_INCLUDE_DIR = $(PYTHON_HOME)/include/$(PYTHON_VERSION)