diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-29 20:56:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-29 20:56:02 +0000 |
| commit | 40a4dd47c275aca60d7381a93635d31b8d09451a (patch) | |
| tree | a1e62b25ccb28b5754aac10d175ed75ddb4537b1 /sci-libs/cfitsio/files | |
| parent | 4c51ef39a9b443061a7071e002d7daa2a4d16141 (diff) | |
gentoo auto-resync : 29:01:2023 - 20:56:01
Diffstat (limited to 'sci-libs/cfitsio/files')
| -rw-r--r-- | sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch | 19 | ||||
| -rw-r--r-- | sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch | 53 |
2 files changed, 72 insertions, 0 deletions
diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch new file mode 100644 index 000000000000..9ec614616552 --- /dev/null +++ b/sci-libs/cfitsio/files/cfitsio-4.2.0-pkgconfig.patch @@ -0,0 +1,19 @@ +diff -Naur a/cfitsio.pc.cmake b/cfitsio.pc.cmake +--- a/cfitsio.pc.cmake 2022-10-31 19:40:23.000000000 +0100 ++++ b/cfitsio.pc.cmake 2022-12-14 23:35:53.572102437 +0100 +@@ -1,12 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ + libdir=@LIB_DESTINATION@ +-includedir=@INCLUDE_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@/cfitsio + + Name: cfitsio + Description: FITS File Subroutine Library + URL: https://heasarc.gsfc.nasa.gov/fitsio/ + Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@ + Libs: -L${libdir} -lcfitsio +-Libs.private: @PKG_CONFIG_LIBS@ -lm +-Cflags: -I${includedir} ++Libs.private: @PKG_CONFIG_LIBS@ -lm -z ++Cflags: -D_REENTRANT -I${includedir} diff --git a/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch new file mode 100644 index 000000000000..fab375507f83 --- /dev/null +++ b/sci-libs/cfitsio/files/cfitsio-4.2.0-system-zlib.patch @@ -0,0 +1,53 @@ +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in 2022-10-31 19:40:23.000000000 +0100 ++++ b/Makefile.in 2022-12-14 23:37:10.785099554 +0100 +@@ -102,7 +102,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} $@; \ +@@ -142,31 +142,31 @@ + ${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} + + testf77: testf77.o lib${PACKAGE}.a ${OBJECTS} +- ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++ ${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS} + + # Tested with bison 3.8 and flex 2.6.4 + eval: # Rebuild eval_* files from flex/bison source |