diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-10-17 02:05:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 02:05:12 -0700 |
| commit | 32c5722104fc28cd55d166a2c04e1d44906eec68 (patch) | |
| tree | 7c688990b7f6b50f119ef88c746c3ac2e1897a0b /ports/healpix | |
| parent | 0b5b24698f08f6f4ca0ef984b2ae9d6a6ba0d7a6 (diff) | |
| download | vcpkg-32c5722104fc28cd55d166a2c04e1d44906eec68.tar.gz vcpkg-32c5722104fc28cd55d166a2c04e1d44906eec68.zip | |
[cfitsio] Update to 3.49 and fix dependency zlib (#14064)
* [cfitsio] Update to 3.49 and fix dependency zlib
* export unofficial cmake targets
* [cfitsio] Fix file paths, export cmake targets
* [cfitsio] Required cmake_policy CMP0012
* [ccfits] Fix dependency cfitsio
* [cfitsio] Fixup pkgconfig
* [healpix] Fix dependency cfitsio
* [cfitsio] fix homepage and patches
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/healpix')
| -rw-r--r-- | ports/healpix/CONTROL | 2 | ||||
| -rw-r--r-- | ports/healpix/fix-dependency.patch | 13 | ||||
| -rw-r--r-- | ports/healpix/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/healpix/CONTROL b/ports/healpix/CONTROL index 8b1e856e2..554f8fb1f 100644 --- a/ports/healpix/CONTROL +++ b/ports/healpix/CONTROL @@ -1,6 +1,6 @@ Source: healpix Version: 1.12.10 -Port-Version: 6 +Port-Version: 7 Homepage: http://healpix.sourceforge.net/ Description: HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere. Build-Depends: cfitsio diff --git a/ports/healpix/fix-dependency.patch b/ports/healpix/fix-dependency.patch new file mode 100644 index 000000000..87d7336f5 --- /dev/null +++ b/ports/healpix/fix-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/src/cxx/configure.ac b/src/cxx/configure.ac +index 63f05d7..e284f0d 100644 +--- a/src/cxx/configure.ac ++++ b/src/cxx/configure.ac +@@ -175,7 +175,7 @@ CXXCFLAGS_NO_C="$CXXCFLAGS $CPPFLAGS" + LDCCFLAGS="$LDFLAGS $CCFLAGS" + LDCXXFLAGS="$LDFLAGS $CXXCFLAGS" + +-AC_CHECK_LIB([cfitsio],[ffgnrwll],,AC_MSG_ERROR([could not find the cfitsio library]),[-lm]) ++AC_CHECK_LIB([cfitsio -lz],[ffgnrwll],,AC_MSG_ERROR([could not find the cfitsio library]),[-lm -lz]) + AC_CHECK_HEADERS([fitsio.h],,AC_MSG_ERROR([could not find the cfitsio header file]),) + + AC_SUBST(SILENT_RULE) diff --git a/ports/healpix/portfile.cmake b/ports/healpix/portfile.cmake index c1fa90f36..dde1ac3c1 100644 --- a/ports/healpix/portfile.cmake +++ b/ports/healpix/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_sourceforge( REF Healpix_${HEALPIX_VER} FILENAME "Healpix_${HEALPIX_PACK_NAME}.tar.gz" SHA512 29fe680d757bd94651bf029654257cb67286643aad510df4c2f0b06245174411376ec1beca64feebfac14a6fc0194525170635842916d79dcaddeddd9ac6f6c7 + PATCHES fix-dependency.patch ) vcpkg_configure_make( |