From f97334dcc9439fbab0f73a9aeed1ef0001da3fc2 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 9 Jul 2013 11:43:47 -0400 Subject: [PATCH] LP 1190279 Modularize Makefile.install misc. repairs apply missing install_libdbi for wheezy/squeeze Added libtest-warn-perl prereq for wheezy/squeeze per-distro makefile improvments install soap-lite as a deb before CPAN runs. Business::OnlinePayment::PayPal fails otherwise. by default, use apt-get as the APT tool, since all debian distros have this move 'install_yaz' directly into Makefile.ubuntu-lucid, since that's the only OS which uses it. Squeeze also needs an updated yaz; Yaz-related repairs give debians and lucid libbz2-dev; precise has it already Signed-off-by: Bill Erickson Signed-off-by: Chris Sharp Signed-off-by: Dan Scott --- Open-ILS/src/extras/install/Makefile.common | 11 ----------- Open-ILS/src/extras/install/Makefile.debian | 3 +-- .../src/extras/install/Makefile.debian-squeeze | 15 ++++++++++++++- .../src/extras/install/Makefile.debian-wheezy | 4 ++++ .../src/extras/install/Makefile.ubuntu-lucid | 16 +++++++++++++--- .../src/extras/install/Makefile.ubuntu-precise | 1 + 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common index 5db0e63813..efd52d35c9 100644 --- a/Open-ILS/src/extras/install/Makefile.common +++ b/Open-ILS/src/extras/install/Makefile.common @@ -1,10 +1,5 @@ # Functions used by all installers -# We need a recent version of Yaz -# Ubuntu 10.04 comes with 3.0.52 -YAZ=yaz-4.2.32 -YAZ_HOST=http://ftp.indexdata.dk/pub/yaz - # Install the CPAN modules install_cpan: for m in $(CPAN_MODULES); do perl -MCPAN -e "install \"$$m\";"; done @@ -37,10 +32,4 @@ clean: make -C $(LIBDBI_DRIVERS) clean make -C $(LIBJS_PERL) clean -# Install a known working version of YAZ -install_yaz: - if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi; - tar xzf $(YAZ).tar.gz - cd $(YAZ) && ./configure && make && make install && ldconfig - # vim:noet:sw=4:ts=4: diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian index aa4d0652f2..892569b1eb 100644 --- a/Open-ILS/src/extras/install/Makefile.debian +++ b/Open-ILS/src/extras/install/Makefile.debian @@ -1,7 +1,6 @@ # actions required by all debian-based OSs -# is this OS-specific? -APT_TOOL=aptitude -yq +APT_TOOL=apt-get -yq install_debs: $(APT_TOOL) install $(DEBS) diff --git a/Open-ILS/src/extras/install/Makefile.debian-squeeze b/Open-ILS/src/extras/install/Makefile.debian-squeeze index f87712b403..3bc586a091 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-squeeze +++ b/Open-ILS/src/extras/install/Makefile.debian-squeeze @@ -4,6 +4,9 @@ DIR = $(dir $(lastword $(MAKEFILE_LIST))) APT_BACKPORT_TOOL = aptitude -t squeeze-backports -yq APT_SAFE_TOOL = aptitude -P APT_TOOL=aptitude -yq +YAZ=yaz-4.2.32 +YAZ_HOST=http://ftp.indexdata.dk/pub/yaz + export DEBS = \ apache2-prefork-dev\ @@ -40,12 +43,15 @@ export DEBS = \ libparent-perl\ libspreadsheet-writeexcel-perl\ libssh2-1-dev\ + libtest-warn-perl\ libtext-aspell-perl\ libtext-csv-perl\ libuniversal-require-perl\ libunix-syslog-perl\ libuuid-tiny-perl\ libyaz-dev\ + libsoap-lite-perl\ + libbz2-dev\ yaz export DEB_APACHE_MODS = \ @@ -82,15 +88,22 @@ PGSQL_CLIENT_DEBS_91 = \ libpq-dev \ postgresql-client-9.1 -all: install_pgsql_client_backport_debs_91 + +all: install_pgsql_client_backport_debs_91 install_yaz make -f $(DIR)/Makefile.debian install_debs make -f $(DIR)/Makefile.debian test_for_libdbi_pkg make -f $(DIR)/Makefile.common install_net_z3950_simpleserver make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force + make -f $(DIR)/Makefile.common install_libdbi make -f $(DIR)/Makefile.debian install_js_sm make -f $(DIR)/Makefile.debian debian_sys_config +install_yaz: + if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi; + tar xzf $(YAZ).tar.gz + cd $(YAZ) && ./configure && make && make install && ldconfig + install_postgres_server: $(APT_BACKPORT_TOOL) install $(PGSQL_SERVER_DEBS_91) diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy index 6169609f8c..fb18745f68 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-wheezy +++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy @@ -44,6 +44,7 @@ export DEBS = \ libspreadsheet-writeexcel-perl\ libsru-perl\ libssh2-1-dev\ + libtest-warn-perl\ libtext-aspell-perl\ libtext-csv-perl\ libuniversal-require-perl\ @@ -51,6 +52,8 @@ export DEBS = \ libuuid-tiny-perl\ libyaz-dev\ postgresql-client-9.1\ + libsoap-lite-perl\ + libbz2-dev\ yaz export DEB_APACHE_MODS = \ @@ -83,6 +86,7 @@ all: make -f $(DIR)/Makefile.common install_net_z3950_simpleserver make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force + make -f $(DIR)/Makefile.common install_libdbi make -f $(DIR)/Makefile.debian install_js_sm make -f $(DIR)/Makefile.debian debian_sys_config diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid index 80d2b3caf4..97783a4068 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid @@ -3,6 +3,11 @@ DIR = $(dir $(lastword $(MAKEFILE_LIST))) APT_SAFE_TOOL = aptitude -P +# We need a recent version of Yaz +# Ubuntu 10.04 comes with 3.0.52 +YAZ=yaz-4.2.32 +YAZ_HOST=http://ftp.indexdata.dk/pub/yaz + export DEBS = \ apache2-prefork-dev\ aspell\ @@ -42,7 +47,8 @@ export DEBS = \ libuniversal-require-perl\ libunix-syslog-perl\ libuuid-tiny-perl\ - libyaz-dev\ + libbz2-dev\ + libsoap-lite-perl export DEB_APACHE_MODS = \ expires\ @@ -79,16 +85,20 @@ PGSQL_CLIENT_DEBS_91 = \ libpq-dev \ postgresql-client-9.1 -all: +all: install_yaz make -f $(DIR)/Makefile.debian install_debs make -f $(DIR)/Makefile.debian test_for_libdbi_pkg - make -f $(DIR)/Makefile.common install_yaz make -f $(DIR)/Makefile.common install_net_z3950_simpleserver make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force make -f $(DIR)/Makefile.debian install_js_sm make -f $(DIR)/Makefile.debian debian_sys_config +install_yaz: + if [ ! -d $(YAZ) ]; then wget $(YAZ_HOST)/$(YAZ).tar.gz; fi; + tar xzf $(YAZ).tar.gz + cd $(YAZ) && ./configure && make && make install && ldconfig + install_pgsql_server_debs_91: $(APT_TOOL) install $(PGSQL_SERVER_DEBS_91) diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-precise b/Open-ILS/src/extras/install/Makefile.ubuntu-precise index 96881a3d88..1b0d391cff 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-precise +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-precise @@ -54,6 +54,7 @@ export DEBS = \ libuuid-tiny-perl\ libyaz-dev\ postgresql-client-9.1\ + libsoap-lite-perl\ yaz export DEB_APACHE_MODS = \ -- 2.43.2