From 1fb79f8b5bbb363ba34bd41e32096f363050d458 Mon Sep 17 00:00:00 2001 From: Hari Sekhon Date: Mon, 25 Feb 2019 11:25:33 +0000 Subject: [PATCH] updated Makefile.in --- Makefile.in | 121 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 90 insertions(+), 31 deletions(-) diff --git a/Makefile.in b/Makefile.in index e3dd11e4..8c5fb0a8 100755 --- a/Makefile.in +++ b/Makefile.in @@ -67,33 +67,49 @@ common: system-packages submodules .PHONY: system-packages system-packages: - if [ -x /sbin/apk ]; then $(MAKE) apk-packages; fi - if [ -x /usr/bin/apt-get ]; then $(MAKE) apt-packages; fi - if [ -x /usr/bin/yum ]; then $(MAKE) yum-packages; fi + if [ -x /sbin/apk ]; then $(MAKE) apk-packages apk-packages-perl apk-packages-python; fi + if [ -x /usr/bin/apt-get ]; then $(MAKE) apt-packages apt-packages-perl apt-packages-python; fi + if [ -x /usr/bin/yum ]; then $(MAKE) yum-packages yum-packages-perl yum-packages-python; fi if [ -x /usr/local/bin/brew -a `uname` = Darwin ]; then $(MAKE) homebrew-packages; fi .PHONY: apk-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 \ - apk-packages-perl.txt \ - apk-packages-perl-dev.txt \ - apk-packages-python.txt \ - apk-packages-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"; \ fi; \ done #for x in apk-packages-{optional,cpan,pip}.txt; do \ - for x in \ - apk-packages-optional.txt \ - apk-packages-cpan.txt \ - apk-packages-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"; \ + fi; \ + done + +.PHONY: apk-packages-perl +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"; \ + fi; \ + done + #for x in apk-packages-{optional,cpan,pip}.txt; do \ + for x in apk-packages-cpan.txt; do \ + if [ -f "setup/$$x" ]; then \ + NO_FAIL=1 NO_UPDATE=1 bash-tools/apk-install-packages.sh "setup/$$x"; \ + fi; \ + done + +.PHONY: apk-packages-python +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"; \ + fi; \ + done + for x in apk-packages-pip.txt; do \ if [ -f "setup/$$x" ]; then \ NO_FAIL=1 NO_UPDATE=1 bash-tools/apk-install-packages.sh "setup/$$x"; \ fi; \ @@ -102,24 +118,39 @@ apk-packages: .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 \ - deb-packages-perl.txt \ - deb-packages-perl-dev.txt \ - deb-packages-python.txt \ - deb-packages-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"; \ fi; \ done #for x in deb-packages-{optional,cpan,pip}.txt; do \ - for x in \ - deb-packages-optional.txt \ - deb-packages-cpan.txt \ - deb-packages-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"; \ + fi; \ + done + +.PHONY: apt-packages-perl +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"; \ + fi; \ + done + for x in deb-packages-cpan.txt; do \ + if [ -f "setup/$$x" ]; then \ + NO_FAIL=1 NO_UPDATE=1 bash-tools/apt-install-packages.sh "setup/$$x"; \ + fi; \ + done + +.PHONY: apt-packages-python +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"; \ + fi; \ + done + for x in deb-packages-pip.txt; do \ if [ -f "setup/$$x" ]; then \ NO_FAIL=1 NO_UPDATE=1 bash-tools/apt-install-packages.sh "setup/$$x"; \ fi; \ @@ -130,12 +161,40 @@ yum-packages: bash-tools/install_epel_repo.sh # installing packages individually to catch package install failure, otherwise yum succeeds even if it misses a package - for x in rpm-packages{,-perl,-python}{,-dev}.txt; do \ + for x in rpm-packages.txt rpm-packages-dev.txt; do \ + if [ -f "setup/$$x" ]; then \ + bash-tools/yum-install-packages.sh "setup/$$x"; \ + 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"; \ + fi; \ + done + +.PHONY: yum-packages-perl +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"; \ + fi; \ + done + for x in rpm-packages-cpan.txt; do \ + if [ -f "setup/$$x" ]; then \ + NO_FAIL=1 bash-tools/yum-install-packages.sh "setup/$$x"; \ + fi; \ + done + +.PHONY: yum-packages-python +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"; \ fi; \ done - for x in rpm-packages-{optional,cpan,pip}.txt; do \ + for x in rpm-packages-pip.txt; do \ if [ -f "setup/$$x" ]; then \ NO_FAIL=1 bash-tools/yum-install-packages.sh "setup/$$x"; \ fi; \