From 6fa2c4f35f56420dea960099fed35f5a1f98bfd3 Mon Sep 17 00:00:00 2001
From: Raul Infante-Sainz <infantesainz@gmail.com>
Date: Fri, 31 May 2019 17:44:15 +0100
Subject: Fixing rpath problem in CFITSIO installation

`cfitsio' was recently updated and it cames up with a problem when
trying to build shared libraries (on Mac OS system laptop). This is
because the `configure' script for building `cfitsio' include by default
`rpath'.

With this commit, this issue is fixed by modifying the installation of
`cfitsio'. Using `sed', each ocurrence of `@rpath' in `configure' is
replaced by `$(ildir)'. Once it has been done, the installation of
`cfitsio' goes as normal.

In this commit, the version of the `cfitsio' has been also updated to
the most recent one.
---
 reproduce/software/make/high-level.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'reproduce/software/make/high-level.mk')

diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 98cdf76..2c35982 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -259,22 +259,22 @@ $(tarballs): $(tdir)/%: | $(lockdir)
 $(ibidir)/cfitsio: $(tdir)/cfitsio-$(cfitsio-version).tar.gz \
                    $(ibidir)/curl
 
-        # CFITSIO hard-codes the absolute address of cURL's `curl-config'
-        # program (which gives the necessary header and linking
-        # information) into the configure script. So we'll have to modify
-        # it manually before doing the standard build.
+	# CFITSIO hard-codes '@rpath' inside the shared library on
+	# Mac systems. So we need to change it to our library
+	# installation path. It doesn't affect GNU/Linux, so we'll
+	# just do it in any case to keep things clean.
 	topdir=$(pwd); cd $(ddir); tar xf $<
 	customtar=cfitsio-$(cfitsio-version)-custom.tar.gz
-	sed cfitsio/configure \
-	    -e's|/usr/bin/curl-config|$(ibdir)/curl-config|g' \
-	    > cfitsio/configure_tmp
-	mv cfitsio/configure_tmp cfitsio/configure
-	chmod +x cfitsio/configure
-	tar cf $$customtar cfitsio
+	cd cfitsio-$(cfitsio-version)
+	sed configure -e's|@rpath|$(ildir)|g' > configure_tmp
+	mv configure_tmp configure
+	chmod +x configure
+	cd ..
+	tar cf $$customtar cfitsio-$(cfitsio-version)
 	cd $$topdir
 
-        # Continue the standard build on the customized tarball.
-	$(call gbuild, $$customtar, cfitsio, , \
+	# Continue the standard build on the customized tarball.
+	$(call gbuild, $$customtar, cfitsio-$(cfitsio-version), , \
 	               --enable-sse2 --enable-reentrant, , \
 	               make shared) \
 	&& rm $$customtar \
-- 
cgit v1.2.1