[med-svn] [Git][med-team/lagan][master] 4 commits: d/rules: Add -fsigned-char to DEB_CFLAGS_MAINT_APPEND (Fixed !x86 debci)
Nilesh Patra (@nilesh)
gitlab at salsa.debian.org
Thu Mar 10 08:18:52 GMT 2022
Nilesh Patra pushed to branch master at Debian Med / lagan
Commits:
7feb4565 by Nilesh Patra at 2022-03-10T13:29:50+05:30
d/rules: Add -fsigned-char to DEB_CFLAGS_MAINT_APPEND (Fixed !x86 debci)
- - - - -
45a2f115 by Nilesh Patra at 2022-03-10T13:38:17+05:30
Propagate hardening flags
- - - - -
fb3a1c81 by Nilesh Patra at 2022-03-10T13:38:17+05:30
Upload to unstable
- - - - -
4ba1237b by Nilesh Patra at 2022-03-10T13:47:35+05:30
Propagate hardening flags in src/glocal
- - - - -
3 changed files:
- debian/changelog
- debian/patches/cross.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+lagan (2.0-8) unstable; urgency=medium
+
+ * Team Upload.
+ * d/rules: Add -fsigned-char to
+ DEB_CFLAGS_MAINT_APPEND (Fixed !x86 debci)
+ * Propagate hardening flags
+
+ -- Nilesh Patra <nilesh at debian.org> Thu, 10 Mar 2022 13:29:54 +0530
+
lagan (2.0-7) unstable; urgency=medium
* Team upload
=====================================
debian/patches/cross.patch
=====================================
@@ -3,10 +3,8 @@ Date: Sun, 26 May 2019 19:29:13 +0200
Bug-Debian: https://bugs.debian.org/929590
Description: fix insane upstream build system
-Index: lagan/src/Makefile
-===================================================================
---- lagan.orig/src/Makefile
-+++ lagan/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
@@ -1,5 +1,5 @@
-CC = gcc $(CFLAGS)
-CPP = g++ $(CFLAGS)
@@ -15,79 +13,77 @@ Index: lagan/src/Makefile
CFLAGS += -O3 # -Wall -W
TRGT_DIR = ..
-@@ -9,46 +9,46 @@ clean:
+@@ -9,46 +9,46 @@
rm -f *.o *~ utils/*~ mlagan.purify core
(cd glocal; $(MAKE) clean)
../anchors: anchors.c skiplist.c
- $(CC) -o $(TRGT_DIR)/anchors anchors.c skiplist.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/anchors anchors.c skiplist.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/anchors anchors.c skiplist.c $(LDFLAGS)
../chaos: fchaos.c thrtrie.c skiplist.c global.c translate.c mempage.c filebuffer.c
- $(CC) -o $(TRGT_DIR)/chaos fchaos.c thrtrie.c skiplist.c global.c translate.c filebuffer.c -lm -DCHAOS__FLAG $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/chaos fchaos.c thrtrie.c skiplist.c global.c translate.c filebuffer.c -lm -DCHAOS__FLAG $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/chaos fchaos.c thrtrie.c skiplist.c global.c translate.c filebuffer.c -lm -DCHAOS__FLAG $(LDFLAGS)
../order: order.c diagmatrix.c filebuffer.c
- $(CC) -o $(TRGT_DIR)/order order.c diagmatrix.c filebuffer.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/order order.c diagmatrix.c filebuffer.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/order order.c diagmatrix.c filebuffer.c $(LDFLAGS)
../mlagan: mlagan.c diagmatrix.c multial.c skiplist.c filebuffer.c
- $(CC) -o $(TRGT_DIR)/mlagan mlagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/mlagan mlagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/mlagan mlagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG $(LDFLAGS)
../prolagan: prolagan.c diagmatrix.c multial.c skiplist.c filebuffer.c
- $(CC) -o $(TRGT_DIR)/prolagan prolagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/prolagan prolagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/prolagan prolagan.c multial.c diagmatrix.c skiplist.c filebuffer.c -lm -DMULTIAL__FLAG $(LDFLAGS)
../utils/bin2mf: utils/bin2mf.c
- $(CC) -o $(TRGT_DIR)/utils/bin2mf utils/bin2mf.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/bin2mf utils/bin2mf.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/bin2mf utils/bin2mf.c $(LDFLAGS)
../utils/bin2bl: utils/bin2bl.c
- $(CC) -o $(TRGT_DIR)/utils/bin2bl utils/bin2bl.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/bin2bl utils/bin2bl.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/bin2bl utils/bin2bl.c $(LDFLAGS)
../utils/cextract: utils/cextract.c
- $(CC) -o $(TRGT_DIR)/utils/cextract utils/cextract.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/cextract utils/cextract.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/cextract utils/cextract.c $(LDFLAGS)
../utils/cstat: utils/cstat.c
- $(CC) -o $(TRGT_DIR)/utils/cstat utils/cstat.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/cstat utils/cstat.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/cstat utils/cstat.c $(LDFLAGS)
../utils/contigorder: utils/contigorder.c
- $(CC) -o $(TRGT_DIR)/utils/contigorder utils/contigorder.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/contigorder utils/contigorder.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/contigorder utils/contigorder.c $(LDFLAGS)
../utils/getbounds: utils/getbounds.c
- $(CC) -o $(TRGT_DIR)/utils/getbounds utils/getbounds.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/getbounds utils/getbounds.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/getbounds utils/getbounds.c $(LDFLAGS)
../utils/getcontigpos: utils/getcontigpos.c
- $(CC) -o $(TRGT_DIR)/utils/getcontigpos utils/getcontigpos.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/getcontigpos utils/getcontigpos.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/getcontigpos utils/getcontigpos.c $(LDFLAGS)
../utils/getlength: utils/getlength.c
- $(CC) -o $(TRGT_DIR)/utils/getlength utils/getlength.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/getlength utils/getlength.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/getlength utils/getlength.c $(LDFLAGS)
../utils/getoverlap: utils/getoverlap.c
- $(CC) -o $(TRGT_DIR)/utils/getoverlap utils/getoverlap.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/getoverlap utils/getoverlap.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/getoverlap utils/getoverlap.c $(LDFLAGS)
../utils/rc: utils/rc.c
- $(CC) -o $(TRGT_DIR)/utils/rc utils/rc.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/rc utils/rc.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/rc utils/rc.c $(LDFLAGS)
../utils/seqmerge: utils/seqmerge.c
- $(CC) -o $(TRGT_DIR)/utils/seqmerge utils/seqmerge.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/seqmerge utils/seqmerge.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/seqmerge utils/seqmerge.c $(LDFLAGS)
../utils/scorealign: utils/scorealign.c
- $(CC) -o $(TRGT_DIR)/utils/scorealign utils/scorealign.c -lm $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/scorealign utils/scorealign.c -lm $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/scorealign utils/scorealign.c -lm $(LDFLAGS)
../utils/scorecontigs: utils/scorecontigs.c
- $(CC) -o $(TRGT_DIR)/utils/scorecontigs utils/scorecontigs.c -lm $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/scorecontigs utils/scorecontigs.c -lm $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/scorecontigs utils/scorecontigs.c -lm $(LDFLAGS)
../utils/fa2xfa: utils/fa2xfa.c
- $(CC) -o $(TRGT_DIR)/utils/fa2xfa utils/fa2xfa.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/fa2xfa utils/fa2xfa.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/fa2xfa utils/fa2xfa.c $(LDFLAGS)
../utils/overlay: utils/overlay.c
- $(CC) -o $(TRGT_DIR)/utils/overlay utils/overlay.c $(LDFLAGS)
-+ $(CC) $(CFLAGS) -o $(TRGT_DIR)/utils/overlay utils/overlay.c $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/overlay utils/overlay.c $(LDFLAGS)
../utils/Glue: utils/Glue.cpp
- $(CPP) -o $(TRGT_DIR)/utils/Glue utils/Glue.cpp $(LDFLAGS)
-+ $(CXX) $(CFLAGS) -o $(TRGT_DIR)/utils/Glue utils/Glue.cpp $(LDFLAGS)
++ $(CXX) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/Glue utils/Glue.cpp $(LDFLAGS)
../utils/dotplot: utils/dotplot.cpp
- $(CPP) -o $(TRGT_DIR)/utils/dotplot utils/dotplot.cpp $(LDFLAGS)
-+ $(CXX) $(CFLAGS) -o $(TRGT_DIR)/utils/dotplot utils/dotplot.cpp $(LDFLAGS)
-Index: lagan/src/glocal/Makefile
-===================================================================
---- lagan.orig/src/glocal/Makefile
-+++ lagan/src/glocal/Makefile
++ $(CXX) $(CFLAGS) $(CPPFLAGS) -o $(TRGT_DIR)/utils/dotplot utils/dotplot.cpp $(LDFLAGS)
+--- a/src/glocal/Makefile
++++ b/src/glocal/Makefile
@@ -1,7 +1,7 @@
-CC = g++
+CXX = g++
@@ -98,12 +94,16 @@ Index: lagan/src/glocal/Makefile
# LIBDIR = -L/usr/local/lib
MLIB = -lm
INCDIR = -I./
-@@ -10,7 +10,7 @@ TRGT = glocal
+@@ -10,10 +10,10 @@
OBJECTS = glocal.o io.o rightinfluence.o leftinfluence.o score.o
.cpp.o:
- $(CC) -Wno-deprecated $(CFLAGS) $(INCDIR) -c $*.cpp $(LDFLAGS)
-+ $(CXX) -Wno-deprecated $(CFLAGS) $(INCDIR) -c $*.cpp $(LDFLAGS)
++ $(CXX) -Wno-deprecated $(CFLAGS) $(CPPFLAGS) $(INCDIR) -c $*.cpp $(LDFLAGS)
$(TRGT): $(OBJECTS)
- $(CLINKER) $(OPTFLAGS) $(OBJECTS) -o $(TRGT_DIR)/$(TRGT) $(MLIB)
+- $(CLINKER) $(OPTFLAGS) $(OBJECTS) -o $(TRGT_DIR)/$(TRGT) $(MLIB)
++ $(CLINKER) $(OPTFLAGS) $(OBJECTS) -o $(TRGT_DIR)/$(TRGT) $(MLIB) $(LDFLAGS)
+
+ clean :
+ rm -f *.o ./*~ *~ core
=====================================
debian/rules
=====================================
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
DH_VERBOSE := 1
+export DEB_CFLAGS_MAINT_APPEND=-fsigned-char
%:
dh $@
View it on GitLab: https://salsa.debian.org/med-team/lagan/-/compare/1aa56619e152b70019c5d498296cf89ef6836f7b...4ba1237b50300129ec76549f5528fdd38e53b134
--
View it on GitLab: https://salsa.debian.org/med-team/lagan/-/compare/1aa56619e152b70019c5d498296cf89ef6836f7b...4ba1237b50300129ec76549f5528fdd38e53b134
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/20220310/f22471b3/attachment-0001.htm>
More information about the debian-med-commit
mailing list