[med-svn] [Git][med-team/libatomic-queue][master] 2 commits: Fix soname

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libatomic-queue


Commits:
33164578 by Andreas Tille at 2020-10-25T22:15:04+01:00
Fix soname

- - - - -
08878795 by Andreas Tille at 2020-10-25T22:27:58+01:00
Ignore dh_strip error

- - - - -


3 changed files:

- debian/control
- debian/patches/generate-shared-library.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -59,7 +59,7 @@ Description: C++ atomic_queue library
 Package: libatomic-queue-dev
 Section: libdevel
 Architecture: any
-Depends: libatomicqueue0 (= ${binary:Version}),
+Depends: libatomic-queue0 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Description: devel files for C++ atomic_queue library


=====================================
debian/patches/generate-shared-library.patch
=====================================
@@ -24,7 +24,7 @@ Description: Fix unused variable
  COMPILE.C = ${CC} -o $@ -c ${cppflags} ${cflags} -MD -MP $(abspath $<)
  LINK.EXE = ${LD} -o $@ $(ldflags) $(filter-out Makefile,$^) $(ldlibs)
 -LINK.SO = ${LD} -o $@ -shared $(ldflags) $(filter-out Makefile,$^) $(ldlibs)
-+LINK.SO = ${LD} -o $@.$(SOVERSION) -shared $(ldflags) $(filter-out Makefile,$^) $(ldlibs)
++LINK.SO = ${LD} -o $@.$(SOVERSION) -shared -Wl,-soname,`basename $@`.$(SOVERSION) $(ldflags) $(filter-out Makefile,$^) $(ldlibs)
  LINK.A = ${AR} rscT $@ $(filter-out Makefile,$^)
  
  exes := benchmarks tests


=====================================
debian/rules
=====================================
@@ -23,8 +23,12 @@ override_dh_install:
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
-		    --movedev debian/tmp/usr/include/* usr/include \
-		    --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+		    --movedev include usr \
 		    $$(find . -name "*.so")
-	find debian -name lib*.la -delete
 
+# FIXME: No idea why  dh_strip  fails with 
+#strip: debian/libatomic-queue-dev/usr/lib/x86_64-linux-gnu/libatomic_queue.a: sorry: copying thin archives is not currently supported: invalid operation
+#dh_strip: error: strip --strip-debug --remove-section=.comment --remove-section=.note --enable-deterministic-archives -R .gnu.lto_\* -R .gnu.debuglto_\* -N __gnu_lto_slim -N __gnu_lto_v1 debian/libatomic-queue-dev/usr/lib/x86_64-linux-gnu/libatomic_queue.a returned exit code 1
+#dh_strip: error: Aborting due to earlier error
+override_dh_strip:
+	dh_strip || true



View it on GitLab: https://salsa.debian.org/med-team/libatomic-queue/-/compare/a63b105cc9669c1a35d59d84eb433bdb2dbcde7c...08878795430d4c3f690d4648e76b947301dbe86a

-- 
View it on GitLab: https://salsa.debian.org/med-team/libatomic-queue/-/compare/a63b105cc9669c1a35d59d84eb433bdb2dbcde7c...08878795430d4c3f690d4648e76b947301dbe86a
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/20201025/44c9d59e/attachment-0001.html>