aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Infante-Sainz <infantesainz@gmail.com>2019-04-27 15:46:04 +0100
committerRaul Infante-Sainz <infantesainz@gmail.com>2019-04-27 15:46:04 +0100
commit53c7b2a17d9f12f62b19166446e1558299a80e39 (patch)
treee8da436705bfa15c57c478cb958b397a01cce657
parent98176063ff38962080772b47104911a607131428 (diff)
Astrometry-net installation modified to avoid two reporting steps
Until this commit, we had a problem in the installation of Astrometry-net in Mac OS systems. During the runing of the Makefile, it stopped at the reporting stage because it tried to do a couple of steps that in Mac OS are not possible: $ cat /proc/cpuinfo $ free The reason is that `/proc/cpuinfo' and `free' doesn't exist in Mac OS. With this commit, we override these two steps. Since they are only for reporting, they are not mandatory. So, we avoid doing them by using `sed' before running the Makefile.
-rw-r--r--.file-metadatabin6713 -> 6713 bytes
-rw-r--r--reproduce/software/make/high-level.mk8
2 files changed, 8 insertions, 0 deletions
diff --git a/.file-metadata b/.file-metadata
index 4790f7e..9282b57 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 56adf8e..decb88d 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -498,9 +498,17 @@ $(ibidir)/astrometrynet: $(tdir)/astrometry.net-$(astrometrynet-version).tar.gz
$(ibidir)/python \
$(ibidir)/swig \
$(ibidir)/wcslib
+ # We are modifying the Makefile in two steps because on Mac OS system we
+ # do not have `/proc/cpuinfo' nor `free'. Since this is only for the
+ # `report.txt', this changes do not causes problems in running
+ # `astrometrynet'
cd $(ddir) \
+ && rm -rf astrometry.net-$(astrometrynet-version) \
&& if ! tar xf $<; then echo; echo "Tar error"; exit 1; fi \
&& cd astrometry.net-$(astrometrynet-version) \
+ && sed -e 's|cat /proc/cpuinfo|echo "Ignoring CPU info"|' \
+ -e 's|-free|echo "Ignoring RAM info"|' Makefile > Makefile.tmp \
+ && mv Makefile.tmp Makefile \
&& make \
&& make py \
&& make extra \