File cfitsio-zlib.patch of Package cfitsio

Overview Repositories Revisions Requests Users Attributes Meta

File cfitsio-zlib.patch of Package cfitsio (Revision 1890bead8a2d0b12ac0d25f44f613603)

Currently displaying revision 1890bead8a2d0b12ac0d25f44f613603 , Show latest

diff -Naur cfitsio.orig/Makefile.in cfitsio/Makefile.in
--- cfitsio.orig/Makefile.in	2013-12-06 00:20:57.000000000 +0200
+++ cfitsio/Makefile.in	2014-02-16 22:57:32.164992353 +0200
@@ -63,9 +63,7 @@
 		pliocomp.c fits_hcompress.c fits_hdecompress.c \
 		simplerng.c
 
-ZLIB_SOURCES =	zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
-		zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
-		zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
+ZLIB_SOURCES =	zlib/zcompress.c zlib/zuncompress.c
 
 SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
 
@@ -97,7 +95,7 @@
 shared: libcfitsio${SHLIB_SUFFIX}
 
 libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
-		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
+		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS} -lz
 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
@@ -118,13 +116,13 @@
 		${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
 
 testprog:	testprog.o libcfitsio.a ${OBJECTS}
-		${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
+		${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS} -lz
 
 fpack:		fpack.o fpackutil.o libcfitsio.a ${OBJECTS}
-		${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
+		${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
 
 funpack:	funpack.o fpackutil.o libcfitsio.a ${OBJECTS}
-		${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
+		${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
 
 fitscopy:	fitscopy.o libcfitsio.a ${OBJECTS}
 		${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
diff -Naur cfitsio.orig/zlib/zcompress.c cfitsio/zlib/zcompress.c
--- cfitsio.orig/zlib/zcompress.c	2013-10-30 22:10:22.000000000 +0200
+++ cfitsio/zlib/zcompress.c	2014-02-16 22:57:59.157432119 +0200
@@ -2,7 +2,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include "zlib.h"  
+#include <zlib.h>
 
 #define GZBUFSIZE 115200    /* 40 FITS blocks */
 #define BUFFINCR   28800    /* 10 FITS blocks */

Places

File cfitsio-zlib.patch of Package cfitsio (Revision 1890bead8a2d0b12ac0d25f44f613603)

Places