updated Makefile.in

pull/2/head
Hari Sekhon 5 years ago
parent 1c83a50285
commit 212b80808b

@ -201,15 +201,17 @@ system-packages-python: system-packages
apk-packages:
# not portable in Alpine sh
#for x in apk-packages{,-perl,-python}{,-dev}.txt; do \
for x in apk-packages.txt apk-packages-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/apk_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/apk_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
#for x in apk-packages-{optional,cpan,pip}.txt; do \
for x in apk-packages-optional.txt; do \
if [ -f "setup/$$x" ]; then \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apk_install_packages.sh "setup/$$x"; \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apk_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -217,13 +219,14 @@ apk-packages:
apk-packages-perl:
for x in apk-packages-perl.txt apk-packages-perl-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/apk_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/apk_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
#for x in apk-packages-{optional,cpan,pip}.txt; do \
for x in apk-packages-cpan.txt; do \
if [ -f "setup/$$x" ] && [ -z "$(PERLBREW_PERL)" ]; then \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apk_install_packages.sh "setup/$$x"; \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apk_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -231,27 +234,29 @@ apk-packages-perl:
apk-packages-python:
for x in apk-packages-python.txt apk-packages-python-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/apk_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/apk_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
for x in apk-packages-pip.txt; do \
if [ -f "setup/$$x" ] && [ -z "$(PYTHON_VIRTUALENV)" ]; then \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apk_install_packages.sh "setup/$$x"; \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apk_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
.PHONY: apt-packages
apt-packages:
#for x in deb-packages{,-perl,-python}{,-dev}.txt; do \
for x in deb-packages.txt deb-packages-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/apt_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/apt_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
#for x in deb-packages-{optional,cpan,pip}.txt; do \
for x in deb-packages-optional.txt; do \
if [ -f "setup/$$x" ]; then \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apt_install_packages.sh "setup/$$x"; \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apt_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -259,14 +264,14 @@ apt-packages:
apt-packages-perl:
for x in deb-packages-perl.txt deb-packages-perl-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/apt_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/apt_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
for x in deb-packages-cpan.txt; do \
if [ -f "setup/$$x" ] && \
[ -z "$(PERLBREW_PERL)" ] && \
[ -z "$(GOOGLE_CLOUD_SHELL)" ]; then \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apt_install_packages.sh "setup/$$x"; \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apt_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -274,14 +279,14 @@ apt-packages-perl:
apt-packages-python:
for x in deb-packages-python.txt deb-packages-python-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/apt_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/apt_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
for x in deb-packages-pip.txt; do \
if [ -f "setup/$$x" ] && \
[ -z "$(PYTHON_VIRTUALENV)" ] && \
[ -z "$(GOOGLE_CLOUD_SHELL)" ]; then \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apt_install_packages.sh "setup/$$x"; \
NO_FAIL=1 NO_UPDATE=1 $(BASH_TOOLS)/apt_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -292,12 +297,12 @@ yum-packages:
# installing packages individually to catch package install failure, otherwise yum succeeds even if it misses a package
for x in rpm-packages.txt rpm-packages-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/yum_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/yum_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
for x in rpm-packages-optional.txt; do \
if [ -f "setup/$$x" ]; then \
NO_FAIL=1 $(BASH_TOOLS)/yum_install_packages.sh "setup/$$x"; \
NO_FAIL=1 $(BASH_TOOLS)/yum_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -306,12 +311,12 @@ yum-packages-perl:
# installing packages individually to catch package install failure, otherwise yum succeeds even if it misses a package
for x in rpm-packages-perl.txt rpm-packages-perl-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/yum_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/yum_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
for x in rpm-packages-cpan.txt; do \
if [ -f "setup/$$x" ] && [ -z "$(PERLBREW_PERL)" ]; then \
NO_FAIL=1 $(BASH_TOOLS)/yum_install_packages.sh "setup/$$x"; \
NO_FAIL=1 $(BASH_TOOLS)/yum_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -320,12 +325,12 @@ yum-packages-python:
# installing packages individually to catch package install failure, otherwise yum succeeds even if it misses a package
for x in rpm-packages-python.txt rpm-packages-python-dev.txt; do \
if [ -f "setup/$$x" ]; then \
$(BASH_TOOLS)/yum_install_packages.sh "setup/$$x"; \
$(BASH_TOOLS)/yum_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
for x in rpm-packages-pip.txt; do \
if [ -f "setup/$$x" ] && [ -z "$(PYTHON_VIRTUALENV)" ]; then \
NO_FAIL=1 $(BASH_TOOLS)/yum_install_packages.sh "setup/$$x"; \
NO_FAIL=1 $(BASH_TOOLS)/yum_install_packages.sh "setup/$$x" || exit 1; \
fi; \
done
@ -333,7 +338,7 @@ yum-packages-python:
homebrew-packages:
# Fails if any of the packages are already installed, ignore and continue - if it's a problem the latest build steps will fail with missing headers
if test -f setup/brew-packages.txt; then \
NO_FAIL=1 $(BASH_TOOLS)/brew_install_packages.sh setup/brew-packages.txt; \
NO_FAIL=1 $(BASH_TOOLS)/brew_install_packages.sh setup/brew-packages.txt || exit 1; \
fi
@# fix for OpenSSL 1.0 -> 1.1 library linkage breaking python -c 'import hashlib', which break pips, eg:
@# https://stackoverflow.com/questions/20399331/error-importing-hashlib-with-python-2-7-but-not-with-2-6
@ -350,7 +355,7 @@ apk-packages-remove:
for x in lib pylib lib-java; do test -f "$$x" && pushd "$$X" && $(MAKE) apk-packages-remove; popd; done; :
for x in apk-packages-{,perl-,python-}dev.txt; do \
if [ -f "setup/$$x" ]; then \
NO_FAIL=1 $(BASH_TOOLS)/apk_remove_packages.sh "setup/$xx"; \
NO_FAIL=1 $(BASH_TOOLS)/apk_remove_packages.sh "setup/$xx" || exit 1; \
fi; \
done
$(SUDO) rm -fr /var/cache/apk/*
@ -360,7 +365,7 @@ apt-packages-remove:
for x in lib pylib lib-java; do test -f "$$x" && pushd "$$X" && $(MAKE) apt-packages-remove; popd; done; :
for x in deb-packages-{,perl-,python-}dev.txt; do \
if [ -f "setup/$$x" ]; then \
NO_FAIL=1 $(BASH_TOOLS)/apt_remove_packages.sh "setup/$xx"; \
NO_FAIL=1 $(BASH_TOOLS)/apt_remove_packages.sh "setup/$xx" || exit 1; \
fi; \
done
@ -369,7 +374,7 @@ yum-packages-remove:
for x in lib pylib lib-java; do test -f "$$x" && pushd "$$X" && $(MAKE) yum-packages-remove; popd; done; :
for x in rpm-packages-{,perl-,python-}dev.txt; do \
if [ -f "setup/$$x" ]; then \
NO_FAIL=1 $(BASH_TOOLS)/yum_remove_packages.sh "setup/$xx"; \
NO_FAIL=1 $(BASH_TOOLS)/yum_remove_packages.sh "setup/$xx" || exit 1; \
fi; \
done

Loading…
Cancel
Save