[med-svn] r22300 - in trunk/packages/idba/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2016-07-01 12:36:17 +0000 (Fri, 01 Jul 2016)
New Revision: 22300

Modified:
   trunk/packages/idba/trunk/debian/changelog
   trunk/packages/idba/trunk/debian/patches/use-atomic-for-mips.patch
Log:
Update mips patch

Modified: trunk/packages/idba/trunk/debian/changelog
===================================================================
--- trunk/packages/idba/trunk/debian/changelog	2016-07-01 12:34:42 UTC (rev 22299)
+++ trunk/packages/idba/trunk/debian/changelog	2016-07-01 12:36:17 UTC (rev 22300)
@@ -8,6 +8,8 @@
   * d/p/run_tests, d/rules, d/control: Run the test suite during 
     package build   
   * Update standards version to 3.9.8 
+  * d/p/clang: disable this patch, it seems to have been applied upstream
+  * d/p/use-atomic-*: update patch 
 
  -- Andreas Tille <tille at debian.org>  Wed, 20 Jan 2016 09:40:51 +0100
 

Modified: trunk/packages/idba/trunk/debian/patches/use-atomic-for-mips.patch
===================================================================
--- trunk/packages/idba/trunk/debian/patches/use-atomic-for-mips.patch	2016-07-01 12:34:42 UTC (rev 22299)
+++ trunk/packages/idba/trunk/debian/patches/use-atomic-for-mips.patch	2016-07-01 12:36:17 UTC (rev 22300)
@@ -6,23 +6,12 @@
  To avoid this behaviuor it is needed to use
  corresponding __atomic_* from libatomic library.
 
---- a/bin/Makefile.in
-+++ b/bin/Makefile.in
-@@ -283,7 +283,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = $(top_srcdir)/lib/libassembly.a
-+LIBS = $(top_srcdir)/lib/libassembly.a @LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
 --- a/src/basic/atomic_integer.h
 +++ b/src/basic/atomic_integer.h
-@@ -35,6 +35,25 @@ public:
-     bool operator ==(const AtomicInteger<T> &x) const { return value_ == x.value_; }
-     bool operator !=(const AtomicInteger<T> &x) const { return value_ != x.value_; }
+@@ -53,6 +53,25 @@
  
+ #   else
+ 
 +
 +#   if defined(__mips__) && !defined(__mips64)
 +
@@ -45,10 +34,10 @@
      T operator += (T x) { return __sync_add_and_fetch(&value_, x); }
      T operator -= (T x) { return __sync_sub_and_fetch(&value_, x); }
      T operator |= (T x) { return __sync_or_and_fetch(&value_, x); }
-@@ -49,6 +68,8 @@ public:
-     bool CompareAndSet(T old_value, T new_value)
-     { return __sync_bool_compare_and_swap(&value_, old_value, new_value); }
+@@ -69,6 +88,8 @@
  
+ #   endif
+ 
 +#   endif
 +
      void swap(AtomicInteger &x)