[med-svn] [Git][med-team/libatomicqueue][master] 4 commits: Debian Med maintainer

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libatomicqueue


Commits:
b0bd0590 by Andreas Tille at 2020-10-23T20:56:27+02:00
Debian Med maintainer

- - - - -
8d562723 by Andreas Tille at 2020-10-23T21:54:40+02:00
Use d-shlibs, add missing Build-Depends

- - - - -
6d5d7e5a by Andreas Tille at 2020-10-23T22:01:31+02:00
Remove unused variable

- - - - -
5283b9f1 by Andreas Tille at 2020-10-23T22:11:03+02:00
DEP3 + another fix

- - - - -


7 changed files:

- debian/control
- − debian/libatomicqueue-dev.dirs
- − debian/libatomicqueue-dev.install
- − debian/libatomicqueue1.dirs
- + debian/patches/fix_unused_variable.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -1,9 +1,14 @@
 Source: libatomicqueue
 Priority: optional
-Maintainer: Steffen Moeller <moeller at debian.org>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Steffen Moeller <moeller at debian.org>
 Build-Depends: debhelper-compat (= 12),
+               d-shlibs,
+               libboost-dev,
+               libboost-test-dev,
                libconcurrentqueue-dev,
                libreaderwriterqueue-dev,
+               libtbb-dev,
                libxenium-dev
 Standards-Version: 4.5.0
 Section: libs


=====================================
debian/libatomicqueue-dev.dirs deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib
-usr/include


=====================================
debian/libatomicqueue-dev.install deleted
=====================================
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*
-usr/share/pkgconfig/*


=====================================
debian/libatomicqueue1.dirs deleted
=====================================
@@ -1 +0,0 @@
-usr/lib


=====================================
debian/patches/fix_unused_variable.patch
=====================================
@@ -0,0 +1,33 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 23 Oct 2020 22:10:01 +0200
+Description: Fix unused variable
+
+--- a/src/benchmarks.cc
++++ b/src/benchmarks.cc
+@@ -179,7 +179,7 @@ void throughput_producer(unsigned N, Que
+     cycles_t expected = 0;
+     t0->compare_exchange_strong(expected, __builtin_ia32_rdtsc(), std::memory_order_acq_rel, std::memory_order_relaxed);
+ 
+-    region_guard_t<Queue> guard;
++    //region_guard_t<Queue> guard;
+     for(unsigned n = 1, stop = N + 1; n <= stop; ++n)
+         queue->push(n);
+ }
+@@ -189,7 +189,7 @@ void throughput_consumer_impl(unsigned N
+     unsigned const stop = N + 1;
+     sum_t sum = 0;
+ 
+-    region_guard_t<Queue> guard;
++    //region_guard_t<Queue> guard;
+     for(;;) {
+         unsigned n = queue->pop();
+         if(n == stop)
+@@ -388,7 +388,7 @@ void run_throughput_benchmarks(HugePages
+ template<class Queue, bool Sender>
+ void ping_pong_thread_impl(Queue* q1, Queue* q2, unsigned N, cycles_t* time) {
+     cycles_t t0 = __builtin_ia32_rdtsc();
+-    region_guard_t<Queue> guard;
++    //region_guard_t<Queue> guard;
+     for(unsigned i = 1, j = 0; j < N; ++i) {
+         if(Sender) {
+             q1->push(i);


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix_unused_variable.patch


=====================================
debian/rules
=====================================
@@ -13,13 +13,17 @@
 # package maintainers to append LDFLAGS
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-
 %:
 	dh $@
 
-
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+override_dh_install:
+	dh_install
+	d-shlibmove --commit \
+		    --multiarch \
+		    --devunversioned \
+		    --exclude-la \
+		    --movedev debian/tmp/usr/include/* usr/include \
+		    --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+		    debian/tmp/usr/lib/*/*.so
+	find debian -name lib*.la -delete
 



View it on GitLab: https://salsa.debian.org/med-team/libatomicqueue/-/compare/7f23b4e6a61c45434be08044b15acaebecd9b9cd...5283b9f1903aacaa18c8acf848c970949481af5f

-- 
View it on GitLab: https://salsa.debian.org/med-team/libatomicqueue/-/compare/7f23b4e6a61c45434be08044b15acaebecd9b9cd...5283b9f1903aacaa18c8acf848c970949481af5f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201023/c662d36c/attachment-0001.html>