diff options
Diffstat (limited to 'reproduce/software/make')
| -rw-r--r-- | reproduce/software/make/basic.mk | 9 | ||||
| -rw-r--r-- | reproduce/software/make/python.mk | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index c5b4ca5..bf42808 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -57,8 +57,9 @@ export PATH := $(ibdir):$(PATH) export PKG_CONFIG_PATH := $(ildir)/pkgconfig export PKG_CONFIG_LIBDIR := $(ildir)/pkgconfig export CPPFLAGS := -I$(idir)/include $(CPPFLAGS) -export LD_LIBRARY_PATH := $(ildir):$(LD_LIBRARY_PATH) export LDFLAGS := $(rpath_command) -L$(ildir) $(LDFLAGS) +export LD_LIBRARY_PATH := $(shell echo $(ildir):$(LD_LIBRARY_PATH) \ + | sed -e's/::/:/g') # RPATH is automatically written in macOS, so `DYLD_LIBRARY_PATH' is # ultimately redundant. But on some systems, even having a single value @@ -900,7 +901,8 @@ $(ibidir)/git: $(ibidir)/curl \ $(ibidir)/gmp: | $(ibidir)/m4 \ $(ibidir)/coreutils \ $(tdir)/gmp-$(gmp-version).tar.lz - $(call gbuild, gmp-$(gmp-version), static, , , make check) \ + $(call gbuild, gmp-$(gmp-version), static, \ + --enable-cxx --enable-fat, ,make check) \ && echo "GNU Multiple Precision Arithmetic Library $(gmp-version)" > $@ # On Mac OS, libtool does different things, so to avoid confusion, we'll @@ -1059,6 +1061,9 @@ $(ibidir)/perl: | $(ibidir)/coreutils \ -Dldflags="$$LDFLAGS" \ && make SHELL=$(ibdir)/bash -j$(numthreads) \ && make SHELL=$(ibdir)/bash install \ + && cd .. \ + && rm -rf perl-$(perl-version) \ + && cd $$topdir \ && echo "Perl $(perl-version)" > $@ diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index dc5e4f0..dfa65b5 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -35,7 +35,7 @@ # have found several other Python-related environment variables on some # systems which might interfere. To be safe, we are removing all their # values. -export PYTHONPATH := $(installdir)/lib/python/site-packages +export PYTHONPATH := $(idir)/lib/python/site-packages export PYTHONPATH2 := $(PYTHONPATH) export PYTHONPATH3 := $(PYTHONPATH) export _LMFILES_ := @@ -306,7 +306,7 @@ $(ibidir)/python: $(ibidir)/libffi \ if [ x$(on_mac_os) = xyes ]; then \ export CC=clang; \ export CXX=clang++; \ - fi; echo; echo "$@: HERE"; echo;\ + fi; \ $(call gbuild, Python-$(python-version),, \ --without-ensurepip \ --with-system-ffi \ |