From c1790d49b42273b1a3bfecf93582bc7cbe1dafa8 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 28 Jul 2023 16:19:05 +0300 Subject: [PATCH] cfitsio ver. bump --- science/misc/cfitsio/actions.py | 2 +- .../files/fedora/cfitsio-ldflags.patch | 12 +++++ .../files/fedora/cfitsio-pkgconfig.patch | 12 +++++ .../files/fedora/cfitsio-remove-rpath.patch | 12 +++++ .../cfitsio/files/fedora/cfitsio-zlib.patch | 49 +++++++++++++++++++ science/misc/cfitsio/pspec.xml | 27 +++++++++- 6 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 science/misc/cfitsio/files/fedora/cfitsio-ldflags.patch create mode 100644 science/misc/cfitsio/files/fedora/cfitsio-pkgconfig.patch create mode 100644 science/misc/cfitsio/files/fedora/cfitsio-remove-rpath.patch create mode 100644 science/misc/cfitsio/files/fedora/cfitsio-zlib.patch diff --git a/science/misc/cfitsio/actions.py b/science/misc/cfitsio/actions.py index 425bb4132a..9d3b5aa68e 100644 --- a/science/misc/cfitsio/actions.py +++ b/science/misc/cfitsio/actions.py @@ -8,7 +8,7 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get -WorkDir = "cfitsio" +# WorkDir = "cfitsio" def setup(): autotools.autoreconf("-fi") diff --git a/science/misc/cfitsio/files/fedora/cfitsio-ldflags.patch b/science/misc/cfitsio/files/fedora/cfitsio-ldflags.patch new file mode 100644 index 0000000000..ed82a0af74 --- /dev/null +++ b/science/misc/cfitsio/files/fedora/cfitsio-ldflags.patch @@ -0,0 +1,12 @@ +diff -Nuar a/configure b/configure +--- a/configure 2023-07-24 05:59:25.000000000 +0300 ++++ b/configure 2023-07-27 16:58:13.908936565 +0300 +@@ -3994,7 +3994,7 @@ + + #------------------------------------------------------------------------------- + +-LDFLAGS="$CFLAGS" ++# LDFLAGS="$CFLAGS" + LDFLAGS_BIN="$LDFLAGS" + + if test "x$FC" = "xnone" ; then diff --git a/science/misc/cfitsio/files/fedora/cfitsio-pkgconfig.patch b/science/misc/cfitsio/files/fedora/cfitsio-pkgconfig.patch new file mode 100644 index 0000000000..5d51b96957 --- /dev/null +++ b/science/misc/cfitsio/files/fedora/cfitsio-pkgconfig.patch @@ -0,0 +1,12 @@ +diff -ur cfitsio-4.0.0/cfitsio.pc.in cfitsio-4.0.0.pc/cfitsio.pc.in +--- cfitsio-4.0.0/cfitsio.pc.in 2021-05-20 03:18:54.000000000 +0200 ++++ cfitsio-4.0.0.pc/cfitsio.pc.in 2021-12-03 17:38:32.302407819 +0100 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/cfitsio + + Name: cfitsio + Description: FITS File Subroutine Library diff --git a/science/misc/cfitsio/files/fedora/cfitsio-remove-rpath.patch b/science/misc/cfitsio/files/fedora/cfitsio-remove-rpath.patch new file mode 100644 index 0000000000..7baae4dc8e --- /dev/null +++ b/science/misc/cfitsio/files/fedora/cfitsio-remove-rpath.patch @@ -0,0 +1,12 @@ +diff -ur cfitsio-4.2.0/configure cfitsio-4.2.0.rpath/configure +--- cfitsio-4.2.0/configure 2022-11-25 10:08:23.942637069 +0100 ++++ cfitsio-4.2.0.rpath/configure 2022-11-25 10:10:13.213414398 +0100 +@@ -5062,7 +5062,7 @@ + printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h + + # LDFLAGS used by utilities: +- LDFLAGS_BIN="$LDFLAGS_BIN -Wl,-rpath,\${CFITSIO_LIB}" ++ LDFLAGS_BIN="$LDFLAGS_BIN" + ;; + *mingw32*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for large file support" >&5 diff --git a/science/misc/cfitsio/files/fedora/cfitsio-zlib.patch b/science/misc/cfitsio/files/fedora/cfitsio-zlib.patch new file mode 100644 index 0000000000..4e9e64943f --- /dev/null +++ b/science/misc/cfitsio/files/fedora/cfitsio-zlib.patch @@ -0,0 +1,49 @@ +diff -ur cfitsio-3.47/Makefile.in cfitsio-3.47.zlib/Makefile.in +--- cfitsio-3.47/Makefile.in 2019-05-08 17:34:50.000000000 +0200 ++++ cfitsio-3.47.zlib/Makefile.in 2019-08-01 15:52:57.829760351 +0200 +@@ -103,7 +101,7 @@ + shared: lib${PACKAGE}${SHLIB_SUFFIX} + + lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} +- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS} ++ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS} + @if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \ + ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \ + ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ +@@ -140,28 +138,28 @@ + ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< + + smem: smem.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz + + testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + speed: speed.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + eval: # Rebuild eval_* files from flex/bison source + ${FLEX} -t eval.l > eval_l.c1 diff --git a/science/misc/cfitsio/pspec.xml b/science/misc/cfitsio/pspec.xml index 5fecd93374..32f0eac5b3 100644 --- a/science/misc/cfitsio/pspec.xml +++ b/science/misc/cfitsio/pspec.xml @@ -1,5 +1,5 @@ - + cfitsio @@ -13,11 +13,27 @@ app:console C and Fortran library for manipulating FITS files CFITSIO provides simple high-level routines for reading and writing FITS files that insulate the programmer from the internal complexities of the FITS format. - http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3450.tar.gz + https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.3.0.tar.gz + + bzip2 + curl-devel + zlib-devel + + + fedora/cfitsio-ldflags.patch + fedora/cfitsio-pkgconfig.patch + fedora/cfitsio-remove-rpath.patch + fedora/cfitsio-zlib.patch + cfitsio + + zlib + curl + bzip2 + /usr/lib /usr/bin @@ -38,6 +54,13 @@ + + 2023-07-27 + 4.3.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-09-07 3.450