Commit 351f8b51 authored by Sascha Steinbiss's avatar Sascha Steinbiss
Browse files

improve reproducibility

parent 388341af
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
vmatch (2.3.1+dfsg-4) unstable; urgency=medium

  * Pass CFLAGS and friends to SELECT shared object building.

 -- Sascha Steinbiss <satta@debian.org>  Thu, 23 Jan 2020 22:14:29 +0100

vmatch (2.3.1+dfsg-3) unstable; urgency=medium

  * Fix check for SOURCE_DATE_EPOCH.
+110 −0
Original line number Diff line number Diff line
@@ -29,3 +29,113 @@ Last-Update: 2020-01-20
+#define ${PROGRAM}COMPILEHOST "${HOSTNAME}"
 #endif
 ENDOFRELEASEPOST
--- a/src/Vmatch/SELECT/makefile
+++ b/src/Vmatch/SELECT/makefile
@@ -1,11 +1,11 @@
 # makefile to compile shared objects using the gnu C compiler
 # Stefan Kurtz, October 2000
 
-CC=gcc
+#CC=gcc
 
 # in 64-bit mode add -m64
 
-CFLAGS=-Wall -Werror -O3 -g
+CFLAGS+=-Wall -Werror -O3 -g
 
 ifneq ($(SYSTEM),Windows)
 CFLAGS+=-fPIC
@@ -43,15 +43,15 @@
 # on most platforms the shared objects have a suffix .so
 
 %.so:%.c Shareddef
-	${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@
+	${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@ ${LDFLAGS}
 
 mergematches-dbg.so:mergematches.c Shareddef
-	${CC} ${CFLAGS} ${CPPFLAGS} -DDEBUG ${SHARED} $< -o $@
+	${CC} ${CFLAGS} ${CPPFLAGS} -DDEBUG ${SHARED} $< -o $@ ${LDFLAGS}
 
 # on HP-UX the shared objects have a suffix .sl
 
 %.sl:%.c Shareddef
-	@${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@
+	@${CC} ${CFLAGS} ${CPPFLAGS} ${SHARED} $< -o $@ ${LDFLAGS}
 
 # the following goal generates the output of the C-preprocessor
 # applied to the given C-file.
--- a/src/Vmatch/SELECT/mstat.c
+++ b/src/Vmatch/SELECT/mstat.c
@@ -87,20 +87,20 @@
   and \(iend\). The following function reports such section.
 */
 
-static void showsection(ArrayMstatvalue *mstat,Uint istart,Uint iend)
+static void showsection(ArrayMstatvalue *mmstat,Uint istart,Uint iend)
 {
   Uint i;
   Mstatvalue *mstatptr;
 
-  printf("%lu:\n",(Showuint) mstat->spaceMstatvalue[istart].seqnum1);
+  printf("%lu:\n",(Showuint) mmstat->spaceMstatvalue[istart].seqnum1);
   for(i=istart; i<=iend; i++)
   {
-    mstatptr = mstat->spaceMstatvalue + i;
-    if(mstatptr->seqnum1 != mstat->spaceMstatvalue[istart].seqnum1)
+    mstatptr = mmstat->spaceMstatvalue + i;
+    if(mstatptr->seqnum1 != mmstat->spaceMstatvalue[istart].seqnum1)
     {
       fprintf(stderr,"seqnum1 =%lu != %lu\n",
               (Showuint) mstatptr->seqnum1,
-              (Showuint) mstat->spaceMstatvalue[istart].seqnum1);
+              (Showuint) mmstat->spaceMstatvalue[istart].seqnum1);
       exit(EXIT_FAILURE);
     }
     printf("     %lu %lu %lu %lu\n",
@@ -117,27 +117,27 @@
   function \texttt{showsection} is applied.
 */
 
-static void splitMstatvalues(ArrayMstatvalue *mstat)
+static void splitMstatvalues(ArrayMstatvalue *mmstat)
 {
   Uint i, lastseqnum, istart;
 
-  if(mstat->nextfreeMstatvalue == 0)
+  if(mmstat->nextfreeMstatvalue == 0)
   {
     fprintf(stderr,"no matches available\n");
     exit(EXIT_FAILURE);
   }
-  lastseqnum = mstat->spaceMstatvalue[0].seqnum1;
+  lastseqnum = mmstat->spaceMstatvalue[0].seqnum1;
   istart = 0;
-  for(i=1; i<mstat->nextfreeMstatvalue; i++)
+  for(i=1; i<mmstat->nextfreeMstatvalue; i++)
   {
-    if(lastseqnum < mstat->spaceMstatvalue[i].seqnum1)
+    if(lastseqnum < mmstat->spaceMstatvalue[i].seqnum1)
     {
-      showsection(mstat,istart,i-1);
-      lastseqnum = mstat->spaceMstatvalue[i].seqnum1;
+      showsection(mmstat,istart,i-1);
+      lastseqnum = mmstat->spaceMstatvalue[i].seqnum1;
       istart = i;
     }
   }
-  showsection(mstat,istart,i-1);
+  showsection(mmstat,istart,i-1);
 }
 
 /*
--- a/src/Vmatch/SELECT/cgvizout.c
+++ b/src/Vmatch/SELECT/cgvizout.c
@@ -99,7 +99,7 @@
 static ArrayConnectdata *edges;
 
 /*Sorting and grouping of matches. Returns number of generated groups*/
-static Uint multmatchesCountingSort ()
+static Uint multmatchesCountingSort (void)
 {
   Uint maxmatchlen = 0,
        nof_matches,