Commit 54995b13 authored by Steffen Möller's avatar Steffen Möller
Browse files

Fixed gcc-9 FTBFS

parent 9c5675b5

debian/changelog

+13 −0
Original line number Diff line number Diff line 
lagan (2.0-5) unstable; urgency=medium



  * Team upload



  [ Gianfranco Costamagna ]

  * removed "inline" helps to avoid FTBFS (Closes: #925728)



  [ Steffen Moeller ]

  * <ctype.h> included to help FTBFS

  * verbose builds, please



 -- Steffen Moeller <moeller@debian.org>  Fri, 16 Aug 2019 19:49:41 +0200



lagan (2.0-4) unstable; urgency=medium



  [ Helmut Grohne ]

debian/patches/cross.patch

+8 −4
Original line number Diff line number Diff line
@@ -3,8 +3,10 @@ Date: Sun, 26 May 2019 19:29:13 +0200 
Bug-Debian: https://bugs.debian.org/929590

Description: fix insane upstream build system



--- a/src/Makefile

+++ b/src/Makefile

Index: lagan/src/Makefile

===================================================================

--- lagan.orig/src/Makefile

+++ lagan/src/Makefile

@@ -1,5 +1,5 @@

-CC = gcc $(CFLAGS)

-CPP = g++ $(CFLAGS)
@@ -82,8 +84,10 @@ Description: fix insane upstream build system 
 ../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)

--- a/src/glocal/Makefile

+++ b/src/glocal/Makefile

Index: lagan/src/glocal/Makefile

===================================================================

--- lagan.orig/src/glocal/Makefile

+++ lagan/src/glocal/Makefile

@@ -1,7 +1,7 @@

-CC = g++

+CXX = g++

debian/patches/gcc9.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
# Two patches to bring lagan up to speed with gcc-9

Index: lagan/src/fchaos.c

===================================================================

--- lagan.orig/src/fchaos.c

+++ lagan/src/fchaos.c

@@ -430,7 +430,7 @@ int chain(LList* second, int off2, LList

 int tc =0;

 int wc = 0;

 

-inline void findPrev(LList* curr, int position, int offset, float baseval) {

+void findPrev(LList* curr, int position, int offset, float baseval) {

   int j,k;

   LList* temp;

   sle* iterator;

Index: lagan/src/filebuffer.c

===================================================================

--- lagan.orig/src/filebuffer.c

+++ lagan/src/filebuffer.c

@@ -1,5 +1,6 @@

 #include "filebuffer.h"

 #include <stdlib.h>

+#include <ctype.h>

 #include <string.h>

 #include <stdio.h>

 #include <assert.h>

debian/patches/series

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ addTest.patch 
adjustPerlPaths.patch

hardening.patch

cross.patch

gcc9.patch

debian/rules

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/make -f



# DH_VERBOSE := 1

DH_VERBOSE := 1



%:

	dh $@