From c962f16a1af9aa112dab6d824d7fbbfb9475a1b8 Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Mon, 5 Nov 2018 15:42:51 -0500 Subject: [PATCH] LP#1793585: PGSQL dependency update The MARC::XML cpan dependency needs to be included as part of the standalone Postgres server install for Ubuntu 18.04. Signed-off-by: Ben Shum Signed-off-by: Jason Stephenson --- Open-ILS/src/extras/install/Makefile.common | 3 +++ Open-ILS/src/extras/install/Makefile.ubuntu-bionic | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common index c5422879a6..96ec3b8aff 100644 --- a/Open-ILS/src/extras/install/Makefile.common +++ b/Open-ILS/src/extras/install/Makefile.common @@ -9,6 +9,9 @@ install_cpan_force: echo "force install $$m" | perl -MCPAN -e shell ;\ done +install_cpan_pgsql: + for m in $(CPAN_MODULES_PGSQL); do perl -MCPAN -e "install \"$$m\";"; done + install_net_z3950_simpleserver: if [ ! -f $(LIBNET_Z3950_SIMPLESERVER).tar.gz ]; \ then wget $(LIBNET_Z3950_SIMPLESERVER_URL).tar.gz; \ diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic index 1e28f62f8a..dada657000 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-bionic +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-bionic @@ -89,7 +89,6 @@ export DEB_APACHE_DISCONF = \ export CPAN_MODULES = \ Business::OnlinePayment::PayPal \ Email::Send \ - MARC::XML \ MARC::Charset \ Net::Z3950::Simple2ZOOM @@ -97,6 +96,9 @@ export CPAN_MODULES_FORCE = \ Business::Stripe \ Class::DBI::Frozen::301 +export CPAN_MODULES_PGSQL = \ + MARC::XML + PGSQL_SERVER_DEBS_96 = \ $(DEB_PGSQL_COMMON_MODS) \ postgresql-9.6 \ @@ -138,10 +140,12 @@ all: make -f $(DIR)/Makefile.debian install_debs make -f $(DIR)/Makefile.common install_cpan make -f $(DIR)/Makefile.common install_cpan_force + make -f $(DIR)/Makefile.common install_cpan_pgsql make -f $(DIR)/Makefile.debian debian_sys_config install_postgres_server: make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_96)" + make -f $(DIR)/Makefile.common install_cpan_pgsql # note: if/when grunt-cli is available as a # package, use the packaged version instead. -- 2.43.2