...
 
Commits (2)
......@@ -3,13 +3,12 @@ Date: Fri, 16 Feb 2018 14:08:41 +0100
Subject: Fix compilation
---
src/fgwrite.c | 2 ++
src/fgwrite.c | 4 +++-
src/kwdb.c | 7 ++++---
src/mkpkg | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/fgwrite.c b/src/fgwrite.c
index 927e910..f06c853 100644
index 927e910..e3b4e4d 100644
--- a/src/fgwrite.c
+++ b/src/fgwrite.c
@@ -2,6 +2,8 @@
......@@ -21,6 +20,15 @@ index 927e910..f06c853 100644
#include <unistd.h>
#include <fcntl.h>
#include <time.h>
@@ -127,7 +129,7 @@ char *argv[];
static char *def_flist[1] = {NULL};
char *argp, **flist, *arg, *ip;
pointer kwdb, kwtoc;
- char card[256];
+ char card[SZ_PATHNAME];
char *sline;
int argno, ftype, i, ncards, level, phu;
diff --git a/src/kwdb.c b/src/kwdb.c
index aaeeefa..5952e52 100644
--- a/src/kwdb.c
......@@ -44,16 +52,3 @@ index aaeeefa..5952e52 100644
static int hash();
static int addstr();
static int streq();
diff --git a/src/mkpkg b/src/mkpkg
index a2403a6..5d71e6b 100644
--- a/src/mkpkg
+++ b/src/mkpkg
@@ -22,7 +22,7 @@ relink:
!cc -m32 $(HSI_LF) fgread.o kwdb.o checksum.o -o fgread.e
!cc -m32 $(HSI_LF) sum32.o checksum.o -o sum32
$else
- !cc -c $(HSI_CF) fgwrite.c fgread.c sum32.c checksum.c kwdb.c
+ !cc -c fgwrite.c fgread.c sum32.c checksum.c kwdb.c
!cc fgwrite.o kwdb.o -o fgwrite.e
!cc fgread.o kwdb.o checksum.o -o fgread.e
!cc sum32.o checksum.o -o sum32
From: Ole Streicher <olebole@debian.org>
Date: Wed, 28 Feb 2018 14:05:13 +0100
Subject: Propagate CFLAGS etc.
---
src/mkpkg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mkpkg b/src/mkpkg
index a2403a6..308266b 100644
--- a/src/mkpkg
+++ b/src/mkpkg
@@ -22,10 +22,10 @@ relink:
!cc -m32 $(HSI_LF) fgread.o kwdb.o checksum.o -o fgread.e
!cc -m32 $(HSI_LF) sum32.o checksum.o -o sum32
$else
- !cc -c $(HSI_CF) fgwrite.c fgread.c sum32.c checksum.c kwdb.c
- !cc fgwrite.o kwdb.o -o fgwrite.e
- !cc fgread.o kwdb.o checksum.o -o fgread.e
- !cc sum32.o checksum.o -o sum32
+ !$(CC) $(CPPFLAGS) $(CFLAGS) -c fgwrite.c fgread.c sum32.c checksum.c kwdb.c
+ !$(CC) $(LDFLAGS) fgwrite.o kwdb.o -o fgwrite.e
+ !$(CC) $(LDFLAGS) fgread.o kwdb.o checksum.o -o fgread.e
+ !$(CC) $(LDFLAGS) sum32.o checksum.o -o sum32
$endif
!rm fgwrite.o fgread.o kwdb.o checksum.o sum32.o
;
Set-bin-directory.patch
Fix-compilation.patch
Adjust-executable-paths.patch
Propagate-CFLAGS-etc.patch
......@@ -7,6 +7,9 @@
export iraf := /usr/lib/iraf/
export fitsutil := $(CURDIR)/
export HSI_CF := $(CFLAGS) $(CPPFLAGS)
export HSI_LF := $(LDFLAGS)
override_dh_auto_configure:
rm -rf bin
mkdir bin
......