diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-02-13 02:00:57 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-02-13 02:00:57 +0300 |
| commit | 474eb72fac308c71b1e328135acdf93f9c34b64a (patch) | |
| tree | d7ca6a871fff49dff44b26f59a74d56fea5a1e1c | |
| parent | 51d18c9e43f395b67d03c6cb534284a2319a5845 (diff) | |
retroshare: clang build fix
| -rw-r--r-- | net-p2p/retroshare/files/clang.patch | 25 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-scm.ebuild | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/net-p2p/retroshare/files/clang.patch b/net-p2p/retroshare/files/clang.patch new file mode 100644 index 0000000..56663c5 --- /dev/null +++ b/net-p2p/retroshare/files/clang.patch @@ -0,0 +1,25 @@ +diff --git a/libretroshare/src/util/cxx11retrocompat.h b/libretroshare/src/util/cxx11retrocompat.h +index 587b1374d..2acf87995 100644 +--- a/libretroshare/src/util/cxx11retrocompat.h ++++ b/libretroshare/src/util/cxx11retrocompat.h +@@ -19,11 +19,13 @@ + + #ifdef __GNUC__ + # define GCC_VERSION (__GNUC__*10000+__GNUC_MINOR__*100+__GNUC_PATCHLEVEL__) +-# if GCC_VERSION < 40700 +-# define override +-# define final +-# endif // GCC version < 40700 +-# if GCC_VERSION < 40600 +-# define nullptr NULL +-# endif // GCC_VERSION < 40600 ++# ifndef __clang__ ++# if GCC_VERSION < 40700 ++# define override ++# define final ++# endif // GCC version < 40700 ++# if GCC_VERSION < 40600 ++# define nullptr NULL ++# endif // GCC_VERSION < 40600 ++# endif //__clang__ + #endif //defined GNUC diff --git a/net-p2p/retroshare/retroshare-scm.ebuild b/net-p2p/retroshare/retroshare-scm.ebuild index ac96b7b..3cc1ea4 100644 --- a/net-p2p/retroshare/retroshare-scm.ebuild +++ b/net-p2p/retroshare/retroshare-scm.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}/hidden_service.patch" "${FILESDIR}/cflags.patch" "${FILESDIR}/disable_key_array_redraw.patch" + "${FILESDIR}/clang.patch" ) |