aboutsummaryrefslogtreecommitdiff
path: root/reproduce
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-11-08 12:09:42 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-11-08 12:09:42 +0000
commit289679bab09b27d0f0d88967a5edc1212e2ea348 (patch)
tree7acbb920bf91910c0ef4a772bb5e0b9a858a5fea /reproduce
parent5fe30b319c46ab82859d727d6d55461a951f614b (diff)
Minor corrections applied in software builds
While working on a different branch to build the GNU C Library, I noticed a few places in the template that need corrections which are now applied: 1. A new-line character after the "C compiler works" notice at the start of the configure script. 2. Removing possible `::' in the `LD_LIBRARY_PATH' definition of `basic.mk'. Note that its not necessary in the other steps because we don't use any outside-defined `LD_LIBRARY_PATH'. 3. Building GMP for C++ and also with `--enable-fat'. 4. Removing the unpacked Perl tarball directory after its installation.
Diffstat (limited to 'reproduce')
-rwxr-xr-xreproduce/software/bash/configure.sh8
-rw-r--r--reproduce/software/make/basic.mk9
-rw-r--r--reproduce/software/make/python.mk4
3 files changed, 13 insertions, 8 deletions
diff --git a/reproduce/software/bash/configure.sh b/reproduce/software/bash/configure.sh
index 535fcc4..821b303 100755
--- a/reproduce/software/bash/configure.sh
+++ b/reproduce/software/bash/configure.sh
@@ -676,10 +676,10 @@ gcc_works=0
testprog=$tmpblddir/test-c
testsource=$tmpblddir/test.c
echo; echo; echo "Checking host C compiler...";
-echo "#include <stdio.h>" > $testsource
-echo "#include <stdlib.h>" >> $testsource
-echo "int main(void){printf(\"...C compiler works.\");" >> $testsource
-echo " return EXIT_SUCCESS;}" >> $testsource
+echo "#include <stdio.h>" > $testsource
+echo "#include <stdlib.h>" >> $testsource
+echo "int main(void){printf(\"...C compiler works.\n\");" >> $testsource
+echo " return EXIT_SUCCESS;}" >> $testsource
if gcc $testsource -o$testprog && $testprog; then
rm $testsource $testprog
else
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 \