[med-svn] [Git][med-team/genomethreader][master] 3 commits: fix builds on some archs by removing -m32/-m64

[Sascha Steinbiss]

Sascha Steinbiss pushed to branch master at Debian Med / genomethreader


Commits:
91854261 by Sascha Steinbiss at 2020-01-23T00:07:28+01:00
fix builds on some archs by removing -m32/-m64

- - - - -
1ef7deb7 by Sascha Steinbiss at 2020-01-23T00:07:43+01:00
bump Standards-Version

- - - - -
510a556d by Sascha Steinbiss at 2020-01-23T00:08:07+01:00
use deterministic sorted wildcard order in Makefile

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/m32-m64-ignore.patch
- + debian/patches/reproducible.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+genomethreader (1.7.3+dfsg-2) unstable; urgency=medium
+
+  * Fix builds on some archs by removing -m32/-m64.
+  * Use deterministic sorted wildcard order in Makefile.
+  * Bump Standards-Version.
+
+ -- Sascha Steinbiss <satta at debian.org>  Thu, 23 Jan 2020 00:02:20 +0100
+
 genomethreader (1.7.3+dfsg-1) unstable; urgency=medium
 
   * Initial release (Closes: #948526)


=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 12),
                liblua5.1-0-dev,
                libtre-dev,
                asciidoctor
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/genomethreader
 Vcs-Git: https://salsa.debian.org/med-team/genomethreader.git
 Homepage: http://genomethreader.org


=====================================
debian/patches/m32-m64-ignore.patch
=====================================
@@ -0,0 +1,19 @@
+--- a/Makefile
++++ b/Makefile
+@@ -108,16 +108,6 @@
+   BIT=32bit
+ endif
+ 
+-ifeq ($(m32),yes)
+-  GTH_CFLAGS += -m32
+-  GTH_LDFLAGS += -m32
+-endif
+-
+-ifeq ($(m64),yes)
+-  GTH_CFLAGS += -m64
+-  GTH_LDFLAGS += -m64
+-endif
+-
+ # libraries for which we build replacements (that also appear in dependencies)
+ #EXP_LDLIBS+=-lz -lbz2 -lm -ldl
+ #OVERRIDELIBS:=../genometools/lib/libbz2.a


=====================================
debian/patches/reproducible.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -184,7 +184,7 @@
+ LIBGENOMETHREADER_DIRS:= src/libgenomethreader src/gth
+ 
+ # the GenomeThreader library
+-LIBGENOMETHREADER_SRC:=$(foreach DIR,$(LIBGENOMETHREADER_DIRS),$(wildcard $(DIR)/*.c))
++LIBGENOMETHREADER_SRC:=$(foreach DIR,$(LIBGENOMETHREADER_DIRS),$(sort $(wildcard $(DIR)/*.c)))
+ LIBGENOMETHREADER_OBJ:=$(LIBGENOMETHREADER_SRC:%.c=obj/%.o)
+ LIBGENOMETHREADER_DEP:=$(LIBGENOMETHREADER_SRC:%.c=obj/%.d)
+ 


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,5 @@ debian-gt-libs.patch
 gt-path-fix.patch
 hardening.patch
 search-paths.patch
+m32-m64-ignore.patch
+reproducible.patch



View it on GitLab: https://salsa.debian.org/med-team/genomethreader/compare/835cf9863207493aa91fc826ede125254a0e5daf...510a556d89f6793b591571b1bb6509aa1dc9192e

-- 
View it on GitLab: https://salsa.debian.org/med-team/genomethreader/compare/835cf9863207493aa91fc826ede125254a0e5daf...510a556d89f6793b591571b1bb6509aa1dc9192e
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/20200122/d4aba378/attachment-0001.html>