[Pkg-voip-commits] r4430 - in /libcommoncpp2/trunk/debian: changelog control patches/00list patches/no-include-bits_atomicity.h.dpatch
kilian at alioth.debian.org
kilian at alioth.debian.org
Sun Sep 9 14:51:18 UTC 2007
Author: kilian
Date: Sun Sep 9 14:51:18 2007
New Revision: 4430
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4430
Log:
* Urgency high for fixing RC bug.
* Remove bits/atomicity.h detection from sources (Closes: #439117, #441163)
* Bump Standards-Version to 3.7.2.
Added:
libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch (with props)
Modified:
libcommoncpp2/trunk/debian/changelog
libcommoncpp2/trunk/debian/control
libcommoncpp2/trunk/debian/patches/00list
Modified: libcommoncpp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/changelog?rev=4430&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/changelog (original)
+++ libcommoncpp2/trunk/debian/changelog Sun Sep 9 14:51:18 2007
@@ -1,8 +1,11 @@
-libcommoncpp2 (1.5.7-2) UNRELEASED; urgency=low
+libcommoncpp2 (1.5.7-2) UNRELEASED; urgency=high
* NOT RELEASED YET
-
- -- Kilian Krause <kilian at debian.org> Sat, 11 Aug 2007 13:35:24 +0000
+ * Urgency high for fixing RC bug.
+ * Remove bits/atomicity.h detection from sources (Closes: #439117, #441163)
+ * Bump Standards-Version to 3.7.2.
+
+ -- Kilian Krause <kilian at debian.org> Sun, 09 Sep 2007 12:33:14 +0200
libcommoncpp2 (1.5.7-1) unstable; urgency=low
Modified: libcommoncpp2/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/control?rev=4430&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/control (original)
+++ libcommoncpp2/trunk/debian/control Sun Sep 9 14:51:18 2007
@@ -4,9 +4,9 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>
Build-Depends: debhelper (>> 4.1.0), libxml2-dev, zlib1g-dev, help2man, doxygen, dpatch, libgnutls-dev, libgcrypt11-dev | libgcrypt-dev, autotools-dev, cdbs, dpkg-dev (>= 1.13.19)
-Standards-Version: 3.5.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/libcommoncpp2/trunk/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/?op=log
Package: libcommoncpp2-dev
Section: libdevel
Modified: libcommoncpp2/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/00list?rev=4430&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/00list (original)
+++ libcommoncpp2/trunk/debian/patches/00list Sun Sep 9 14:51:18 2007
@@ -2,3 +2,4 @@
01_debian
gnutls
soname-1.5.3
+no-include-bits_atomicity.h
Added: libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch?rev=4430&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch (added)
+++ libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch Sun Sep 9 14:51:18 2007
@@ -1,0 +1,372 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-include-bits_atomicity.h.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libcommoncpp2-1.5.7~/configure libcommoncpp2-1.5.7/configure
+--- libcommoncpp2-1.5.7~/configure 2007-06-12 14:43:52.000000000 +0200
++++ libcommoncpp2-1.5.7/configure 2007-09-09 12:10:02.000000000 +0200
+@@ -25785,292 +25785,7 @@
+ echo "${ECHO_T}$ost_cv_posix_atomic" >&6
+ fi
+
+-
+-for ac_header in bits/atomicity.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_cxx_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+- ost_cv_bits_atomicity=yes
+-else
+- ost_cv_bits_atomicity=no
+-fi
+-
+-done
+-
+- if test $ost_cv_bits_atomicity = yes ; then
+- echo "$as_me:$LINENO: checking for _Atomic_word" >&5
+-echo $ECHO_N "checking for _Atomic_word... $ECHO_C" >&6
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <bits/atomicity.h>
+-int
+-main ()
+-{
+-
+- _Atomic_word i = 0;
+- __atomic_add(&i, 1);
+- __exchange_and_add(&i, 1);
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ost_cv_gcc_atomic=yes
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GCC_BITS_ATOMIC 1
+-_ACEOF
+-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ ost_cv_gcc_atomic=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:$LINENO: result: $ost_cv_gcc_atomic" >&5
+-echo "${ECHO_T}$ost_cv_gcc_atomic" >&6
+-
+- echo "$as_me:$LINENO: checking for __gnu_cxx::_Atomic_word" >&5
+-echo $ECHO_N "checking for __gnu_cxx::_Atomic_word... $ECHO_C" >&6
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <bits/atomicity.h>
+-int
+-main ()
+-{
+-
+- using namespace __gnu_cxx;
+- _Atomic_word i = 0;
+- __atomic_add(&i, 1);
+- __exchange_and_add(&i, 1);
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ost_cv_gcc_cxx_atomic=yes
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GCC_CXX_BITS_ATOMIC 1
+-_ACEOF
+-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ost_cv_gcc_cxx_atomic=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:$LINENO: result: $ost_cv_gcc_cxx_atomic" >&5
+-echo "${ECHO_T}$ost_cv_gcc_cxx_atomic" >&6
+- fi
+-
+-ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-
+- if test "$target" = NONE ; then
+- targetdir=""
+- else
+- targetdir="$target"
+- fi
+-
+
+ for ac_header in thread.h
+ do
+diff -urNad libcommoncpp2-1.5.7~/include/config.h.in libcommoncpp2-1.5.7/include/config.h.in
+--- libcommoncpp2-1.5.7~/include/config.h.in 2007-02-20 09:39:17.000000000 +0100
++++ libcommoncpp2-1.5.7/include/config.h.in 2007-09-09 12:11:51.000000000 +0200
+@@ -236,9 +236,6 @@
+ /* atomic aix operations */
+ #undef HAVE_ATOMIC_AIX
+
+-/* Define to 1 if you have the <bits/atomicity.h> header file. */
+-#undef HAVE_BITS_ATOMICITY_H
+-
+ /* Define to 1 if you have the <bits/wordsize.h> header file. */
+ #undef HAVE_BITS_WORDSIZE_H
+
+@@ -1082,13 +1079,6 @@
+ #endif
+ #endif
+
+-#if defined(__cplusplus)
+-#if defined(HAVE_GCC_BITS_ATOMIC) || defined(HAVE_GCC_CXX_BITS_ATOMIC)
+-#include <bits/atomicity.h>
+-#define HAVE_ATOMIC
+-#endif
+-#endif
+-
+ #if defined(HAVE_PTHREAD_H) && ( defined(_THREAD_SAFE) || defined(_REENTRANT) )
+
+ #ifdef __QNX__
+diff -urNad libcommoncpp2-1.5.7~/m4/ost_pthread.m4 libcommoncpp2-1.5.7/m4/ost_pthread.m4
+--- libcommoncpp2-1.5.7~/m4/ost_pthread.m4 2007-01-24 20:37:38.000000000 +0100
++++ libcommoncpp2-1.5.7/m4/ost_pthread.m4 2007-09-09 12:12:43.000000000 +0200
+@@ -89,38 +89,6 @@
+ AC_MSG_RESULT($ost_cv_posix_atomic)
+ fi
+
+- 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)
+- if test $ost_cv_bits_atomicity = yes ; then
+- AC_MSG_CHECKING([for _Atomic_word])
+- AC_TRY_COMPILE([#include <bits/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])
+- AC_TRY_COMPILE([#include <bits/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
+-
+ AC_LANG_RESTORE
+
+ if test "$target" = NONE ; then
Propchange: libcommoncpp2/trunk/debian/patches/no-include-bits_atomicity.h.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-voip-commits
mailing list