| 1 |
dev-zero 08/05/07 05:32:40 |
| 2 |
|
| 3 |
Modified: 1.6.1-gcc42_atomicity.patch |
| 4 |
Added: 1.6.1-autoconf.patch 1.6.2-autoconf.patch |
| 5 |
Log: |
| 6 |
Fixed problem with autoconf-2.62 (bug #219192), had to update the gcc42_atomicity.patch for that as well. Version bump. |
| 7 |
(Portage version: 2.1.5_rc6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: 1.6.1-gcc42_atomicity.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/commoncpp2/files/1.6.1-gcc42_atomicity.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 1.6.1-gcc42_atomicity.patch 24 Dec 2007 09:31:56 -0000 1.1 |
| 23 |
+++ 1.6.1-gcc42_atomicity.patch 7 May 2008 05:32:40 -0000 1.2 |
| 24 |
@@ -1,31 +1,6 @@ |
| 25 |
-diff -Naur commoncpp2-1.6.1.orig/config.h.in commoncpp2-1.6.1/config.h.in |
| 26 |
---- commoncpp2-1.6.1.orig/config.h.in 2007-12-24 09:45:11.000000000 +0100 |
| 27 |
-+++ commoncpp2-1.6.1/config.h.in 2007-12-24 10:25:43.000000000 +0100 |
| 28 |
-@@ -239,6 +239,9 @@ |
| 29 |
- /* Define to 1 if you have the <bits/atomicity.h> header file. */ |
| 30 |
- #undef HAVE_BITS_ATOMICITY_H |
| 31 |
- |
| 32 |
-+/* Define to 1 if you have the <ext/atomicity.h> header file. */ |
| 33 |
-+#undef HAVE_EXT_ATOMICITY_H |
| 34 |
-+ |
| 35 |
- /* Define to 1 if you have the <bits/wordsize.h> header file. */ |
| 36 |
- #undef HAVE_BITS_WORDSIZE_H |
| 37 |
- |
| 38 |
-@@ -1088,7 +1091,11 @@ |
| 39 |
- |
| 40 |
- #if defined(__cplusplus) |
| 41 |
- #if defined(HAVE_GCC_BITS_ATOMIC) || defined(HAVE_GCC_CXX_BITS_ATOMIC) |
| 42 |
-+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) |
| 43 |
-+#include <ext/atomicity.h> |
| 44 |
-+#else |
| 45 |
- #include <bits/atomicity.h> |
| 46 |
-+#endif |
| 47 |
- #define HAVE_ATOMIC |
| 48 |
- #endif |
| 49 |
- #endif |
| 50 |
diff -Naur commoncpp2-1.6.1.orig/m4/ost_pthread.m4 commoncpp2-1.6.1/m4/ost_pthread.m4 |
| 51 |
---- commoncpp2-1.6.1.orig/m4/ost_pthread.m4 2007-12-24 09:45:11.000000000 +0100 |
| 52 |
-+++ commoncpp2-1.6.1/m4/ost_pthread.m4 2007-12-24 10:12:24.000000000 +0100 |
| 53 |
+--- commoncpp2-1.6.1.orig/m4/ost_pthread.m4 2008-05-06 10:47:42.000000000 +0200 |
| 54 |
++++ commoncpp2-1.6.1/m4/ost_pthread.m4 2008-05-06 16:11:05.000000000 +0200 |
| 55 |
@@ -92,7 +92,9 @@ |
| 56 |
dnl check for gcc's bits/atomicity and the atomic functions therein |
| 57 |
AC_CHECK_HEADERS([bits/atomicity.h], |
| 58 |
@@ -73,3 +48,16 @@ |
| 59 |
AC_MSG_RESULT($ost_cv_gcc_cxx_atomic) |
| 60 |
fi |
| 61 |
|
| 62 |
+@@ -438,7 +458,11 @@ |
| 63 |
+ |
| 64 |
+ #if defined(__cplusplus) |
| 65 |
+ #if defined(HAVE_GCC_BITS_ATOMIC) || defined(HAVE_GCC_CXX_BITS_ATOMIC) |
| 66 |
+-#include <bits/atomicity.h> |
| 67 |
++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) |
| 68 |
++ #include <ext/atomicity.h> |
| 69 |
++#else |
| 70 |
++ #include <bits/atomicity.h> |
| 71 |
++#endif |
| 72 |
+ #define HAVE_ATOMIC |
| 73 |
+ #endif |
| 74 |
+ #endif |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.1 dev-cpp/commoncpp2/files/1.6.1-autoconf.patch |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch?rev=1.1&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch?rev=1.1&content-type=text/plain |
| 82 |
|
| 83 |
Index: 1.6.1-autoconf.patch |
| 84 |
=================================================================== |
| 85 |
--- configure.ac.orig 2008-05-06 10:41:53.000000000 +0200 |
| 86 |
+++ configure.ac 2008-05-06 10:42:19.000000000 +0200 |
| 87 |
@@ -10,6 +10,8 @@ |
| 88 |
|
| 89 |
AC_INIT(src/thread.cpp) |
| 90 |
|
| 91 |
+m4_pattern_allow([^LT_VERSION$]) |
| 92 |
+ |
| 93 |
VERSION="1.6.1" |
| 94 |
LT_RELEASE="1.6" |
| 95 |
LT_VERSION="0:1" |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.1 dev-cpp/commoncpp2/files/1.6.2-autoconf.patch |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch?rev=1.1&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch?rev=1.1&content-type=text/plain |
| 103 |
|
| 104 |
Index: 1.6.2-autoconf.patch |
| 105 |
=================================================================== |
| 106 |
--- configure.ac.orig 2008-05-06 10:41:53.000000000 +0200 |
| 107 |
+++ configure.ac 2008-05-06 10:42:19.000000000 +0200 |
| 108 |
@@ -10,6 +10,8 @@ |
| 109 |
|
| 110 |
AC_INIT(src/thread.cpp) |
| 111 |
|
| 112 |
+m4_pattern_allow([^LT_VERSION$]) |
| 113 |
+ |
| 114 |
VERSION="1.6.2" |
| 115 |
LT_RELEASE="1.6" |
| 116 |
LT_VERSION="0:2" |
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
-- |
| 121 |
gentoo-commits@l.g.o mailing list |
Archives