diff options
| author | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-03-22 16:42:30 +0000 |
|---|---|---|
| committer | Raul Infante-Sainz <infantesainz@gmail.com> | 2019-03-22 16:42:30 +0000 |
| commit | 04f1c2d11c091dd9d32e4f803d81bd5aab42bd81 (patch) | |
| tree | d171e38ee5af6698ef350a71451d00ae34795bfc | |
| parent | 4ecd180c77850b85441d46ed56512f63f11d61eb (diff) | |
| parent | 356d998b87d93cc86dc44642ae95fed7478bc788 (diff) | |
Imported recent work in the main pipeline, conflicts fixed
Conflicts in `gcc' build comments and in mentioning software used in
paper fixed.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | paper.tex | 2 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies-basic.mk | 26 |
3 files changed, 19 insertions, 10 deletions
@@ -17,6 +17,7 @@ build Makefile tex/tikz .gnuastro +.DS_Store .texlive* tex/pipeline LOCAL_tmp.mk @@ -202,7 +202,7 @@ SUNDIAL ITN, and from the Spanish Ministry of Economy and Competitiveness (MINECO) under grant number AYA2016-76219-P. The following free software tools were also critical component of this -research (in alphabetical order): ATLAS \atlasversion, Bzip2 +esearch (in alphabetical order): ATLAS \atlasversion, Bzip2 \bziptwoversion, CFITSIO \cfitsioversion, CMake \cmakeversion, cURL \curlversion, Discoteq flock \flockversion, FreeType \freetypeversion, Git \gitversion, GNU Astronomy Utilities \gnuastroversion, GNU AWK \gawkversion, diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index 853f6d7..4d39141 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -202,11 +202,13 @@ $(tarballs): $(tdir)/%: # is very annoying and can cause many complications. We thus remove any # part of PATH of that has `ccache' in it before making symbolic links to # the programs we are not building ourselves. -makelink = export PATH=$$(echo $(syspath)| tr : '\n' |grep -v ccache \ - | paste -s -d:); \ - a=$$(which $(1) 2> /dev/null); \ - if [ -f $(ibdir)/$(1) ]; then rm $(ibdir)/$(1); fi; \ - if [ x$$a != x ]; then ln -s $$a $(ibdir)/$(1); fi +makelink = origpath="$$PATH"; \ + export PATH=$$(echo $(syspath) | tr : '\n' | grep -v ccache \ + | paste -s -d:); \ + a=$$(which $(1) 2> /dev/null); \ + if [ -f $(ibdir)/$(1) ]; then rm $(ibdir)/$(1); fi; \ + if [ x$$a != x ]; then ln -s $$a $(ibdir)/$(1); fi; \ + export PATH="$$origpath" $(ibdir) $(ildir):; mkdir $@ $(ibdir)/low-level-links: | $(ibdir) $(ildir) @@ -293,7 +295,7 @@ $(ibdir)/bzip2: $(tdir)/bzip2-$(bzip2-version).tar.gz # function here and we need to take some extra steps (inspired # from the "Linux from Scratch" guide for Bzip2): # 1) The `sed' call is for relative installed symbolic links. - # 2) The special Makefile-libbz2_so builds the shared library. + # 2) The special Makefile-libbz2_so builds shared libraries. # # NOTE: the major version number appears in the final symbolic # link. @@ -303,10 +305,16 @@ $(ibdir)/bzip2: $(tdir)/bzip2-$(bzip2-version).tar.gz makeshared="echo no-shared"; \ else \ makecommand="make"; \ - makeshared="make -f Makefile-libbz2_so"; \ + if [ x$(on_mac_os) = xyes ]; then \ + makeshared="echo no-shared"; \ + else \ + makeshared="make -f Makefile-libbz2_so"; \ + fi; \ fi; \ cd $(ddir) && rm -rf $$tdir && tar xf $< && cd $$tdir \ - && sed -i 's@\(ln -s -f \)$$(PREFIX)/bin/@\1@' Makefile \ + && sed -e 's@\(ln -s -f \)$$(PREFIX)/bin/@\1@' Makefile \ + > Makefile.sed \ + && mv Makefile.sed Makefile \ && $$makeshared \ && cp -a libbz2* $(ildir)/ \ && make clean \ @@ -759,8 +767,8 @@ $(ibdir)/gcc: $(gcc-prerequisites) \ # link to '$(idir)/lib'. if [ "x$(on_mac_os)" = xyes ]; then \ $(call makelink,gfortran); \ - $(call makelink,gcc); \ $(call makelink,g++); \ + $(call makelink,gcc); \ else \ \ rm -f $(ibdir)/gcc* $(ibdir)/g++ $(ibdir)/gfortran $(ibdir)/gcov*;\ |