diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-06-12 18:07:23 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-06-12 19:22:38 +0100 |
| commit | ac85d0e251768acca0844836a5513fc0010919a8 (patch) | |
| tree | 519631915110ef854639e2f06d3938beedfd3210 /reproduce/software/make/basic.mk | |
| parent | b217136926af599219a410e426d8157101d8224a (diff) | |
| parent | 7a0d4bf2df6c78015b9dd3ec42cfb23d41252ffb (diff) | |
Imported recent work on Imfit, minor conflicts fixed
The recent work by Raul to import Imfit is now merged into the master
branch. Only a few minor conflicts came up due to the update with CFITSIO
(that Raul also done in parallel on this branch).
Diffstat (limited to 'reproduce/software/make/basic.mk')
| -rw-r--r-- | reproduce/software/make/basic.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index b21e7b0..468563b 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -623,7 +623,7 @@ $(ibidir)/bash: $(tdir)/bash-$(bash-version).tar.lz \ # complete. # # One problem is that Coreutils installs many very basic executables which -# might be in use by other programs. So we must make sure that when +# might be in used by other programs. So we must make sure that when # Coreutils is being built, no other program is being built in # parallel. The solution to the many executables it installs is to make a # fake installation (with `DESTDIR'), and get a list of the contents of the @@ -726,7 +726,8 @@ $(ibidir)/openssl: $(tdir)/openssl-$(openssl-version).tar.gz \ # this project is avoid dependency on the host as much as possible. $(ibidir)/curl: $(tdir)/curl-$(curl-version).tar.gz \ $(ibidir)/coreutils \ - $(ibidir)/openssl #Coreutils: only so cURL is built after it. + $(ibidir)/openssl \ + $(needpatchelf) $(call gbuild, $<, curl-$(curl-version), , \ LIBS="-pthread" \ --with-zlib=$(ildir) \ @@ -744,6 +745,9 @@ $(ibidir)/curl: $(tdir)/curl-$(curl-version).tar.gz \ --disable-ldaps \ --disable-ldap \ --without-nss, V=1) \ + && if [ "x$(needpatchelf)" != x ]; then \ + $(ibdir)/patchelf --set-rpath $(ildir) $(ildir)/libcurl.so; \ + fi \ && echo "cURL $(curl-version)" > $@ |