From 53c7b2a17d9f12f62b19166446e1558299a80e39 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Sat, 27 Apr 2019 15:46:04 +0100 Subject: 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. --- reproduce/software/make/high-level.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'reproduce/software/make') 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 \ -- cgit v1.2.1