From 75571a551f794223bea2995dc7775a49abd63654 Mon Sep 17 00:00:00 2001
From: Raul Infante-Sainz <infantesainz@gmail.com>
Date: Wed, 20 Mar 2019 17:41:50 +0000
Subject: Including ATLAS in the pipeline, not yet complete

An initial installation of atlas is now included in the pipeline,
but we are still trying to make it compile and build smoothly. In
the process, we found that GCC also needs some modifications
(for example rpath issues).
---
 reproduce/src/make/dependencies-basic.mk | 33 +++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'reproduce/src/make/dependencies-basic.mk')

diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index 5965f00..a5cda52 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -744,6 +744,12 @@ $(ibdir)/gcc: $(gcc-prerequisites)  \
         # On a macOS, we (currently!) won't build GCC because of some
         # errors we are still trying to find. So, we'll just make a
         # symbolic link to the host's executables.
+        #
+        # GCC builds is own libraries in '$(idir)/lib64'. But all other
+        # libraries are in '$(idir)/lib'. Since this pipeline is only for a
+        # single architecture, we can trick GCC into building its libraries
+        # in '$(idir)/lib' by defining the '$(idir)/lib64' as a symbolic
+        # link to '$(idir)/lib'.
 	if [ "x$(on_mac_os)" = xyes ]; then                                \
 	  $(call makelink,gfortran);                                       \
 	  $(call makelink,gcc);                                            \
@@ -754,12 +760,14 @@ $(ibdir)/gcc: $(gcc-prerequisites)  \
 	  rm -rf $(ildir)/gcc $(ildir)/libcc* $(ildir)/libgcc*;            \
 	  rm -rf $(ildir)/libgfortran* $(ildir)/libstdc* rm $(idir)/x86_64*;\
 	                                                                   \
+	  ln -fs $(ildir) $(idir)/lib64;                                   \
+	                                                                   \
 	  cd $(ddir);                                                      \
 	  rm -rf gcc-build gcc-$(gcc-version);                             \
-	  tar xf $< &&                                                     \
-	  mkdir $(ddir)/gcc-build &&                                       \
-	  cd $(ddir)/gcc-build &&                                          \
-	  ../gcc-$(gcc-version)/configure SHELL=$(ibdir)/bash              \
+	  tar xf $<                                                        \
+	  && mkdir $(ddir)/gcc-build                                       \
+	  && cd $(ddir)/gcc-build                                          \
+	  && ../gcc-$(gcc-version)/configure SHELL=$(ibdir)/bash           \
 	                    --prefix=$(idir)                               \
 	                    --with-mpc=$(idir)                             \
 	                    --with-mpfr=$(idir)                            \
@@ -777,9 +785,16 @@ $(ibdir)/gcc: $(gcc-prerequisites)  \
 	                    --enable-default-pie                           \
 	                    --enable-default-ssp                           \
 	                    --enable-cet=auto                              \
-	                    --enable-decimal-float &&                      \
-	  make SHELL=$(ibdir)/bash -j$$(nproc) &&                          \
-	  make SHELL=$(ibdir)/bash install &&                              \
-	  cd .. &&                                                         \
-	  rm -rf gcc-build gcc-$(gcc-version);                             \
+	                    --enable-decimal-float                         \
+	  && make SHELL=$(ibdir)/bash -j$$(nproc)                          \
+	  && make SHELL=$(ibdir)/bash install                              \
+	  && cd ..                                                         \
+	  && rm -rf gcc-build gcc-$(gcc-version)                           \
+	                                                                   \
+	  && for f in $$(find $(idir)/libexec/gcc); do                     \
+	       if ldd $$f &> /dev/null; then                               \
+	         patchelf --set-rpath $(ildir) $$f;                        \
+	       fi;                                                         \
+	     done;                                                         \
 	fi
+
-- 
cgit v1.2.1