diff options
| author |   Manuel Rüger <mrueg@gentoo.org> | 2015-05-24 01:02:16 +0000 |
|---|---|---|
| committer | Manuel Rüger <mrueg@gentoo.org> | 2015-05-24 01:02:16 +0000 |
| commit | 0884785b533dee7d3fbbb185a7a44940db789be6 (patch) | |
| tree | aef95304bbe32e0a048c0cf2f52e4cee0bc45f27 /dev-cpp/commoncpp2/files | |
| parent | Remove old. (diff) | |
| download | historical-0884785b533dee7d3fbbb185a7a44940db789be6.tar.gz historical-0884785b533dee7d3fbbb185a7a44940db789be6.tar.bz2 historical-0884785b533dee7d3fbbb185a7a44940db789be6.zip | |
Remove old.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Diffstat (limited to 'dev-cpp/commoncpp2/files')
| -rw-r--r-- | dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch | 63 | ||||
| -rw-r--r-- | dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch | 12 |
2 files changed, 0 insertions, 75 deletions
diff --git a/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch b/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch deleted file mode 100644 index da30105f8cf4..000000000000 --- a/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur commoncpp2-1.6.1.orig/m4/ost_pthread.m4 commoncpp2-1.6.1/m4/ost_pthread.m4 ---- commoncpp2-1.6.1.orig/m4/ost_pthread.m4 2008-05-06 10:47:42.000000000 +0200 -+++ commoncpp2-1.6.1/m4/ost_pthread.m4 2008-05-06 16:11:05.000000000 +0200 -@@ -92,7 +92,9 @@ - dnl check for gcc's bits/atomicity and the atomic functions therein - AC_CHECK_HEADERS([bits/atomicity.h], - ost_cv_bits_atomicity=yes, -- ost_cv_bits_atomicity=no) -+ [AC_CHECK_HEADERS([ext/atomicity.h], -+ ost_cv_bits_atomicity=yes, -+ ost_cv_bits_atomicity=no)]) - if test $ost_cv_bits_atomicity = yes ; then - AC_MSG_CHECKING([for _Atomic_word]) - AC_TRY_COMPILE([#include <bits/atomicity.h>], -@@ -103,7 +105,15 @@ - ], - [ost_cv_gcc_atomic=yes - AC_DEFINE(HAVE_GCC_BITS_ATOMIC, [1], [has gcc atomic functions])], -- [ost_cv_gcc_atomic=no]) -+ [AC_TRY_COMPILE([#include <ext/atomicity.h>], -+ [ -+ _Atomic_word i = 0; -+ __atomic_add(&i, 1); -+ __exchange_and_add(&i, 1); -+ ], -+ [ost_cv_gcc_atomic=yes -+ AC_DEFINE(HAVE_GCC_BITS_ATOMIC, [1], [has gcc atomic functions])], -+ [ost_cv_gcc_atomic=no])]) - AC_MSG_RESULT($ost_cv_gcc_atomic) - - AC_MSG_CHECKING([for __gnu_cxx::_Atomic_word]) -@@ -117,7 +127,17 @@ - [ost_cv_gcc_cxx_atomic=yes - AC_DEFINE(HAVE_GCC_CXX_BITS_ATOMIC, [1], - [has __gnu_cxx atomic functions])], -- [ost_cv_gcc_cxx_atomic=no]) -+ [AC_TRY_COMPILE([#include <ext/atomicity.h>], -+ [ -+ using namespace __gnu_cxx; -+ _Atomic_word i = 0; -+ __atomic_add(&i, 1); -+ __exchange_and_add(&i, 1); -+ ], -+ [ost_cv_gcc_cxx_atomic=yes -+ AC_DEFINE(HAVE_GCC_CXX_BITS_ATOMIC, [1], -+ [has __gnu_cxx atomic functions])], -+ [ost_cv_gcc_cxx_atomic=no])]) - AC_MSG_RESULT($ost_cv_gcc_cxx_atomic) - fi - -@@ -438,7 +458,11 @@ - - #if defined(__cplusplus) - #if defined(HAVE_GCC_BITS_ATOMIC) || defined(HAVE_GCC_CXX_BITS_ATOMIC) --#include <bits/atomicity.h> -+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) -+ #include <ext/atomicity.h> -+#else -+ #include <bits/atomicity.h> -+#endif - #define HAVE_ATOMIC - #endif - #endif diff --git a/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch deleted file mode 100644 index de532b51c3cf..000000000000 --- a/dev-cpp/commoncpp2/files/1.6.2-configure_detect_netfilter.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- m4/ost_socket.m4-orig 2008-11-16 15:24:05.000000000 +0100 -+++ m4/ost_socket.m4 2008-11-16 15:24:10.000000000 +0100 -@@ -95,6 +95,9 @@ - AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,, - [#ifdef HAVE_LIMITS_H - #include <limits.h> -+ #endif -+ #ifdef HAVE_NETINET_IN_H -+ #include <netinet/in.h> - #endif]) - if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" && - [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" && |