diff options
author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-07-06 09:31:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-06 09:31:15 +0200 |
commit | 376cf793312cb7b94541eb6b41f1954b4e64a6c3 (patch) | |
tree | dc1fdcf4f7aaffcf1e4c512d68475475b9492e7d | |
parent | 4b912f5e4958a78037b0784ce502853af5764083 (diff) | |
parent | b1b43173cff6eb21a5f7e9ce8ab18f62b2304225 (diff) | |
download | ATCD-376cf793312cb7b94541eb6b41f1954b4e64a6c3.tar.gz |
Merge pull request #272 from jwillemsen/master
Add default configuration files for MacOSX 10.12 (Sierra)
-rw-r--r-- | ACE/ace/config-macosx-sierra.h | 6 | ||||
-rw-r--r-- | ACE/debian/debian.control | 12 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_macosx_sierra.GNU | 3 |
3 files changed, 15 insertions, 6 deletions
diff --git a/ACE/ace/config-macosx-sierra.h b/ACE/ace/config-macosx-sierra.h new file mode 100644 index 00000000000..f4975a41485 --- /dev/null +++ b/ACE/ace/config-macosx-sierra.h @@ -0,0 +1,6 @@ +#ifndef ACE_CONFIG_MACOSX_SIERRA_H +#define ACE_CONFIG_MACOSX_SIERRA_H + +#include "ace/config-macosx-elcapitan.h" + +#endif // ACE_CONFIG_MACOSX_SIERRA_H diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control index 0b4be51f87a..bbf1e371bc0 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/debian.control @@ -73,7 +73,7 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.4.0d), ${misc:Depends} +Depends: libace-ssl-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.4.0d), ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. @@ -154,7 +154,7 @@ Description: ACE Inet protocol library - development files Package: libace-inet-ssl-6.4.0 Architecture: any Section: libs -Depends: libace-inet-6.3.3, libace-ssl-6.4.0, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.4.0, libace-ssl-6.4.0, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -292,7 +292,7 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.0), ${misc:Depends} +Depends: libace-xtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. @@ -339,7 +339,7 @@ Description: ACE-GUI reactor integration for FLTK Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.0), ${misc:Depends} +Depends: libace-flreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.0), ${misc:Depends} Description: ACE-GUI reactor integration for FLTK - development files This package contains header files and static library for the ACE-FLTK reactor integration. @@ -805,7 +805,7 @@ Description: ACE network service implementations files to link the various ACE network services together, either statically or dynamically, and form complete server programs. -Package: libnetsvcs-6.3.3 +Package: libnetsvcs-6.4.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -819,7 +819,7 @@ Description: ACE network service implementations - libraries Package: libnetsvcs-dev Architecture: any Section: libdevel -Depends: libnetsvcs-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libnetsvcs-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE network service implementations - development files ACE network services provide reusable components for common distributed system tasks such as logging, naming, locking, and time diff --git a/ACE/include/makeinclude/platform_macosx_sierra.GNU b/ACE/include/makeinclude/platform_macosx_sierra.GNU new file mode 100644 index 00000000000..2ed4cc32f9e --- /dev/null +++ b/ACE/include/makeinclude/platform_macosx_sierra.GNU @@ -0,0 +1,3 @@ + +include $(ACE_ROOT)/include/makeinclude/platform_macosx_elcapitan.GNU + |