diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-04 03:47:07 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-04 03:47:07 +0000 |
| commit | 402070be9b15e731f463be1758ca8eaab56cd7cc (patch) | |
| tree | 4c94373cf3f3b8dc229b06b78417bddc3acdbaf6 /reproduce/software/make | |
| parent | 624ccc1326a5b9e86561bedcb97a9f04851e7067 (diff) | |
| parent | a1a966a598eb3693463aa5b0153f37ba22cfee6d (diff) | |
Imported recent updates in Maneage, no conflicts
There weren't any conflicts in this merge; either technical conflicts that
can be found by Git, or logical conflicts (that will cause a crash in the
project).
Diffstat (limited to 'reproduce/software/make')
| -rw-r--r-- | reproduce/software/make/basic.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index c4f0a16..2a28e76 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -974,10 +974,13 @@ $(ibidir)/gmp-$(gmp-version): \ # Less is useful with Git (to view the diffs within a minimal container) # and generally to view large files easily when the project is built in a # container with a minimal OS. -$(ibidir)/less-$(less-version): $(ibidir)/patchelf-$(patchelf-version) +$(ibidir)/less-$(less-version): $(ibidir)/ncurses-$(ncurses-version) tarball=less-$(less-version).tar.gz $(call import-source, $(less-url), $(less-checksum)) $(call gbuild, less-$(less-version), static,,-j$(numthreads)) + if [ -f $(ibdir)/patchelf ]; then + $(ibdir)/patchelf --set-rpath $(ildir) $(ibdir)/less; + fi echo "Less $(less-version)" > $@ # On Mac OS, libtool does different things, so to avoid confusion, we'll |