[med-svn] [Git][med-team/minimap2][master] Fixed compilation of downstream nanopolish
Steffen Möller
gitlab at salsa.debian.org
Sun Mar 15 03:07:39 GMT 2020
Steffen Möller pushed to branch master at Debian Med / minimap2
Commits:
f7f27ee5 by Steffen Moeller at 2020-03-15T04:06:20+01:00
Fixed compilation of downstream nanopolish
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/libminimap2-dev.dirs
- debian/libminimap2-dev.install
- + debian/patches/ar.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,6 +1,20 @@
+minimap2 (2.17+dfsg-5) unstable; urgency=medium
+
+ * Team upload
+ * Not stripping the .a file with Debian
+ * d/control: Added Rules-Requires-Root flag
+
+ -- Steffen Moeller <moeller at debian.org> Sun, 15 Mar 2020 01:24:40 +0100
+
+minimap2 (2.17+dfsg-4) unstable; urgency=medium
+
+ * Team upload
+ * Added include files
+
+ -- Steffen Moeller <moeller at debian.org> Sat, 14 Mar 2020 23:46:18 +0100
+
minimap2 (2.17+dfsg-3) unstable; urgency=medium
- [Steffen Moeller]
* Team upload
* Created -dev package
* Standards-Version: 4.5.0
=====================================
debian/control
=====================================
@@ -15,6 +15,7 @@ Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/minimap2
Vcs-Git: https://salsa.debian.org/med-team/minimap2.git
Homepage: https://github.com/lh3/minimap2
+Rules-Requires-Root: no
Package: minimap2
Architecture: any
=====================================
debian/libminimap2-dev.dirs
=====================================
@@ -1 +1,2 @@
usr/lib
+usr/include
=====================================
debian/libminimap2-dev.install
=====================================
@@ -1 +1,2 @@
*.a usr/lib/
+*.h usr/include/
=====================================
debian/patches/ar.patch
=====================================
@@ -0,0 +1,14 @@
+Index: minimap2/Makefile
+===================================================================
+--- minimap2.orig/Makefile
++++ minimap2/Makefile
+@@ -36,7 +36,8 @@ minimap2-lite:example.o libminimap2.a
+ $(CC) $(CFLAGS) $< -o $@ -L. -lminimap2 $(LIBS) $(LDFLAGS)
+
+ libminimap2.a:$(OBJS)
+- $(AR) -csru $@ $(OBJS)
++ rm -f $@
++ $(AR) csrD $@ $(OBJS)
+
+ sdust:sdust.c kalloc.o kalloc.h kdq.h kvec.h kseq.h ketopt.h sdust.h
+ $(CC) -D_SDUST_MAIN $(CFLAGS) $< kalloc.o -o $@ -lz $(LDFLAGS)
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ hardening.patch
do_not_use_natbib.bst.patch
simde
addLTO.patch
+ar.patch
=====================================
debian/rules
=====================================
@@ -34,8 +34,14 @@ endif
override_dh_compress:
dh_compress --exclude=.pdf
+# No idea why, but the stipping ruined the index of the .a file as spotted by nanopolish
+# as its reverse dependency
+override_dh_strip:
+ dh_strip -Xlibminimap2.a
+
override_dh_auto_clean:
dh_auto_clean
rm -f MT-human.mmi
rm -f tex/minimap2.aux tex/minimap2.bbl tex/minimap2.blg tex/minimap2.log tex/minimap2.out tex/minimap2.pdf
+ rm -f libminimap2.a
View it on GitLab: https://salsa.debian.org/med-team/minimap2/-/commit/f7f27ee500dce8c735fcd1800725c280c3000d1d
--
View it on GitLab: https://salsa.debian.org/med-team/minimap2/-/commit/f7f27ee500dce8c735fcd1800725c280c3000d1d
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/20200315/8801ce2d/attachment-0001.html>
More information about the debian-med-commit
mailing list