From c5ccdd7385499369ca0ca9ed2894658bfe235653 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Tue, 16 Apr 2019 06:39:31 +0100 Subject: CC symbolic link to GCC built after GCC installation Until now, we did not have CC. This is an obsolete way of calling C Compiler, nowadays it is GCC. However, there could be some software that is still using this convention (for example, `netpbm'). With this commit, we make the symbolic link `cc' pointing to the installed `gcc'. --- reproduce/software/make/basic.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'reproduce/software/make/basic.mk') diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index cfa05d2..4fc104d 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -854,6 +854,7 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ $(call makelink,gcc); \ $(call makelink,g++,mandatory); \ $(call makelink,gfortran,mandatory); \ + ln -sf $(which gcc) $(ibdir)/cc; \ ccinfo=$$(gcc --version | awk 'NR==1'); \ echo "C compiler (""$$ccinfo"")" > $@; \ else \ @@ -899,5 +900,6 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ fi; \ done; \ fi \ + ln -sf $(ibdir)/gcc $(ibdir)/cc; \ && echo "GNU Compiler Collection (GCC) $(gcc-version)" > $@; \ fi -- cgit v1.2.1 From fd88ac3569196ef3ea7f8463af7cf34277d577f5 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Tue, 16 Apr 2019 13:09:06 +0100 Subject: Typo corrections in Astrometry-net dependency rules Due to the copy/paste of rules from other files, in some rules there were some spaces insteand of tab. There were also a lack of semicolon in the building of CC, and bad extensions in various tarballs. With this commit, all of these typos have been fixed. --- reproduce/software/make/basic.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'reproduce/software/make/basic.mk') diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index 4fc104d..8a52038 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -854,7 +854,7 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ $(call makelink,gcc); \ $(call makelink,g++,mandatory); \ $(call makelink,gfortran,mandatory); \ - ln -sf $(which gcc) $(ibdir)/cc; \ + ln -sf $$(which gcc) $(ibdir)/cc; \ ccinfo=$$(gcc --version | awk 'NR==1'); \ echo "C compiler (""$$ccinfo"")" > $@; \ else \ @@ -899,7 +899,7 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ patchelf --set-rpath $(ildir) $$f; \ fi; \ done; \ - fi \ - ln -sf $(ibdir)/gcc $(ibdir)/cc; \ + fi; \ + ln -sf $(ibdir)/gcc $(ibdir)/cc \ && echo "GNU Compiler Collection (GCC) $(gcc-version)" > $@; \ fi -- cgit v1.2.1 From f95c0a53bb390795acc2c3eed8de5fcbded5cda3 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Tue, 16 Apr 2019 19:09:31 +0100 Subject: Binutils is built on GNU/Linux as GCC dependency, not in MAC OS Until this commit, we didn't install Binutils. However, we need `strip' for installing Netpbm, and `strip' is part of the Binutil software. With this commit, we include Binutils as a dependency of GCC for GNU/Linux systems. For Mac OS systems we create a symbolic link to `strip' just after the generation of the symbolic link to `gcc'. --- reproduce/software/make/basic.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'reproduce/software/make/basic.mk') diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index 8a52038..6e6550e 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -830,6 +830,7 @@ ifeq ($(host_cc),1) gcc-prerequisites = else gcc-prerequisites = $(tdir)/gcc-$(gcc-version).tar.xz \ + $(ibidir)/binutils \ $(ilidir)/isl \ $(ilidir)/mpc endif @@ -854,6 +855,7 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ $(call makelink,gcc); \ $(call makelink,g++,mandatory); \ $(call makelink,gfortran,mandatory); \ + $(call makelink,strip,mandatory); \ ln -sf $$(which gcc) $(ibdir)/cc; \ ccinfo=$$(gcc --version | awk 'NR==1'); \ echo "C compiler (""$$ccinfo"")" > $@; \ -- cgit v1.2.1