diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-16 22:45:54 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-16 22:59:59 +0100 |
| commit | 99c79ea9fcabc82844f4f1833653cba2f6649ab5 (patch) | |
| tree | 949f2b62dd30f2a262b25a03982f9cfddaaa5131 /reproduce/software/make | |
| parent | 7e8098139f1e8cb2346e9ad3c1787af193d8fea5 (diff) | |
| parent | 6a52c4ee9d2ee8b5723fc9fac4ebc97b77357613 (diff) | |
Imported recent improvements in Maneage, minor conflicts fixed
Some minor conflicts came up in 'download.mk' and 'verify.mk' (as expected
in the "IMPORTANT" commits) and were easily fixed by choosing this branch's
values.
Diffstat (limited to 'reproduce/software/make')
| -rw-r--r-- | reproduce/software/make/basic.mk | 2 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index b4745e2..82bc42d 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -805,7 +805,7 @@ $(idir)/etc:; mkdir $@ # Note: cert.pm has to be AFTER the tarball, otherwise the build script # will try to unpack cert.pm and crash (it unpacks the first dependency # under `tdir'). -$(ibidir)/openssl: $(ibidir)/tar \ +$(ibidir)/openssl: $(ibidir)/perl \ $(tdir)/openssl-$(openssl-version).tar.gz \ $(tdir)/cert.pem \ | $(idir)/etc diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 7cc2d51..75fa8ac 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -1224,9 +1224,9 @@ $(ibidir)/xlsxio: $(ibidir)/cmake \ if [ x$(on_mac_os) = xyes ]; then \ export CC=clang; \ export CXX=clang++; \ - export LDFLAGS="-lbz2"; \ + export LDFLAGS="$$LDFLAGS -lbz2"; \ else \ - export LDFLAGS="-lbz2 -lbsd"; \ + export LDFLAGS="$$LDFLAGS -lbz2 -lbsd"; \ fi; \ $(call cbuild, xlsxio-$(xlsxio-version), static, \ -DMINIZIP_DIR:PATH=$(idir) \ |