From 5c1b2233262639b25f719e0ea99d120046ff64f6 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 1 Aug 2018 12:06:49 -0400 Subject: Help prevent linkage against conda libcurl (#144) --- cfitsio/build.sh | 6 +++--- cfitsio/meta.yaml | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cfitsio/build.sh b/cfitsio/build.sh index 5368e6b..288a62e 100644 --- a/cfitsio/build.sh +++ b/cfitsio/build.sh @@ -1,8 +1,8 @@ case "$(uname)" in Darwin) export CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L" - ;; + ;; esac -./configure --prefix=$PREFIX --disable-static --enable-reentrant -make -j $CPU_COUNT shared +./configure --prefix=$PREFIX --enable-reentrant +make shared make install diff --git a/cfitsio/meta.yaml b/cfitsio/meta.yaml index e225320..13258b3 100644 --- a/cfitsio/meta.yaml +++ b/cfitsio/meta.yaml @@ -1,7 +1,7 @@ {% set name = 'cfitsio' %} {% set version = '3.440' %} {% set version_short = '3440' %} -{% set number = '3' %} +{% set number = '4' %} about: home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html @@ -17,12 +17,10 @@ package: requirements: build: - - curl - - gcc [osx] + - gcc >=4.6 run: - - curl - - libgcc [osx] + - libgcc >=4.6 source: fn: {{ name }}{{ version_short }}.tar.gz -- cgit