diff options
| -rw-r--r-- | reproduce/src/make/dependencies-basic.mk | 5 | ||||
| -rw-r--r-- | reproduce/src/make/dependencies-build-rules.mk | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index ea59566..89584cb 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -315,7 +315,7 @@ $(idir)/etc:; mkdir $@ $(ilidir): | $(ildir); mkdir $@ $(ilidir)/zlib: $(tdir)/zlib-$(zlib-version).tar.gz \ $(ibdir)/make | $(ilidir) - $(call gbuild, $<,zlib-$(zlib-version)) && echo "Zlib is built" > $@ + $(call gbuild, $<, zlib-$(zlib-version)) && echo "Zlib is built" > $@ # OpenSSL: Some programs/libraries later need dynamic linking. So we'll # build libssl (and libcrypto) dynamically also. @@ -350,7 +350,8 @@ $(ilidir)/openssl: $(tdir)/openssl-$(openssl-version).tar.gz \ $(rpath_command) \ --openssldir=$(idir)/etc/ssl \ --with-zlib-lib=$(ildir) \ - --with-zlib-include=$(idir)/include ) && \ + --with-zlib-include=$(idir)/include, , , \ + ./config ) && \ cp $(tdir)/cert.pem $(idir)/etc/ssl/cert.pem && \ echo "OpenSSL is built and ready" > $@ diff --git a/reproduce/src/make/dependencies-build-rules.mk b/reproduce/src/make/dependencies-build-rules.mk index 4de9a4e..25a95af 100644 --- a/reproduce/src/make/dependencies-build-rules.mk +++ b/reproduce/src/make/dependencies-build-rules.mk @@ -48,6 +48,7 @@ # 4: Extra configuration options. # 5: Extra options/arguments to pass to Make. # 6: Step to run between `make' and `make install': usually `make check'. +# 7: The configuration script (`configure' by default). # # NOTE: Unfortunately the configure script of `zlib' doesn't recognize # `SHELL'. So we'll have to remove it from the call to the configure @@ -61,28 +62,28 @@ gbuild = if [ x$(static_build) = xyes ] && [ $(3)x = staticx ]; then \ if ! tar xf $(1); then echo; echo "Tar error"; exit 1; fi; \ cd $(2); \ \ - if [ -f configure ]; then confscript=configure; \ - elif [ -f config ]; then confscript=config; \ + if [ x"$(strip $(7))" = x ]; then confscript=./configure; \ + else confscript="$(strip $(7))"; \ fi; \ \ if [ -f $(ibdir)/bash ]; then \ sed $$confscript -e's|\#\! /bin/sh|\#\! $(ibdir)/bash|' \ -e's|\#\!/bin/sh|\#\! $(ibdir)/bash|' \ - > tmp-$$confscript; \ - mv tmp-$$confscript $$confscript; \ + > $$confscript-tmp; \ + mv $$confscript-tmp $$confscript; \ chmod +x $$confscript; \ shellop="SHELL=$(ibdir)/bash"; \ elif [ -f /bin/bash ]; then shellop="SHELL=/bin/bash"; \ else shellop="SHELL=/bin/sh"; \ fi; \ \ - if [ x"$(2)" = x"zlib-$(zlib-version)" ]; then \ + if [ x"$(strip $(2))" = x"zlib-$(zlib-version)" ]; then \ configop="--prefix=$(idir)"; \ else configop="$$shellop --prefix=$(idir)"; \ fi; \ \ echo; echo "Using '$$confscript' to configure..."; echo; \ - ./$$confscript $(4) $$configop && \ + $$confscript $(4) $$configop && \ make "$$shellop" $(5) && \ $$check && \ make "$$shellop" install && \ |