Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cfitsio ver. bump

Browse Source
This commit is contained in:
Rmys
2023-07-28 16:19:05 +03:00
parent 92575146bd
commit c1790d49b4
6 changed files with 111 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
science/misc/cfitsio/files/fedora/cfitsio-ldflags.patch
+12
View File
@@ -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
science/misc/cfitsio/files/fedora/cfitsio-pkgconfig.patch
+12
View File
@@ -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
science/misc/cfitsio/files/fedora/cfitsio-remove-rpath.patch
+12
View File
@@ -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
science/misc/cfitsio/files/fedora/cfitsio-zlib.patch
+49
View File
@@ -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