From c8b80144785514362e8229942c58f4fee84e28b9 Mon Sep 17 00:00:00 2001 From: Jason Stephenson <jason@sigio.com> Date: Tue, 12 Sep 2017 13:46:51 -0400 Subject: [PATCH] LP#1708048: Fix ld issues by renaming libraries. We add the lib... prefix to all C library names as expected by most linkers. This necessitates changes to the opensrf.xml configuration file. Debian 9's ld also apparently requires that ldconfig be run again after the Evergreen C libraries are installed, so we add that step to the installation instructions as well. Signed-off-by: Jason Stephenson <jason@sigio.com> Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org> --- Open-ILS/examples/opensrf.xml.example | 16 ++++++------- Open-ILS/src/c-apps/Makefile.am | 38 +++++++++++++++--------------- docs/installation/server_installation.adoc | 10 ++++++++ 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/Open-ILS/examples/opensrf.xml.example b/Open-ILS/examples/opensrf.xml.example index 48a37146b7..156562b82b 100644 --- a/Open-ILS/examples/opensrf.xml.example +++ b/Open-ILS/examples/opensrf.xml.example @@ -467,7 +467,7 @@ vim:et:ts=4:sw=4: <keepalive>5</keepalive> <stateless>1</stateless> <language>c</language> - <implementation>oils_auth.so</implementation> + <implementation>liboils_auth.so</implementation> <unix_config> <max_requests>1000</max_requests> <min_children>1</min_children> @@ -490,7 +490,7 @@ vim:et:ts=4:sw=4: <keepalive>5</keepalive> <stateless>1</stateless> <language>c</language> - <implementation>oils_auth_internal.so</implementation> + <implementation>liboils_auth_internal.so</implementation> <unix_config> <max_requests>1000</max_requests> <min_children>1</min_children> @@ -828,7 +828,7 @@ vim:et:ts=4:sw=4: <keepalive>3</keepalive> <stateless>1</stateless> <language>c</language> - <implementation>osrf_math.so</implementation> + <implementation>libosrf_math.so</implementation> <unix_config> <unix_sock>opensrf.math_unix.sock</unix_sock> <unix_pid>opensrf.math_unix.pid</unix_pid> @@ -845,7 +845,7 @@ vim:et:ts=4:sw=4: <keepalive>3</keepalive> <stateless>1</stateless> <language>c</language> - <implementation>osrf_dbmath.so</implementation> + <implementation>libosrf_dbmath.so</implementation> <unix_config> <max_requests>1000</max_requests> <unix_log>opensrf.dbmath_unix.log</unix_log> @@ -943,7 +943,7 @@ vim:et:ts=4:sw=4: <keepalive>6</keepalive> <stateless>1</stateless> <language>C</language> - <implementation>oils_cstore.so</implementation> + <implementation>liboils_cstore.so</implementation> <unix_config> <max_requests>1000</max_requests> <min_children>1</min_children> @@ -973,7 +973,7 @@ vim:et:ts=4:sw=4: <migratable>1</migratable> <stateless>1</stateless> <language>C</language> - <implementation>oils_pcrud.so</implementation> + <implementation>liboils_pcrud.so</implementation> <unix_config> <unix_log>open-ils.pcrud.log</unix_log> @@ -1007,7 +1007,7 @@ vim:et:ts=4:sw=4: <keepalive>6</keepalive> <stateless>1</stateless> <language>C</language> - <implementation>oils_qstore.so</implementation> + <implementation>liboils_qstore.so</implementation> <unix_config> <max_requests>1000</max_requests> <min_children>1</min_children> @@ -1093,7 +1093,7 @@ vim:et:ts=4:sw=4: <keepalive>6</keepalive> <stateless>1</stateless> <language>C</language> - <implementation>oils_rstore.so</implementation> + <implementation>liboils_rstore.so</implementation> <unix_config> <max_requests>400</max_requests> <min_children>1</min_children> diff --git a/Open-ILS/src/c-apps/Makefile.am b/Open-ILS/src/c-apps/Makefile.am index 0672a8ef1b..2daa997b50 100644 --- a/Open-ILS/src/c-apps/Makefile.am +++ b/Open-ILS/src/c-apps/Makefile.am @@ -33,7 +33,7 @@ test_qstore_CFLAGS = $(AM_CFLAGS) test_qstore_LDFLAGS = $(AM_LDFLAGS) -loils_idl -loils_utils test_qstore_DEPENDENCIES = liboils_idl.la liboils_utils.la -lib_LTLIBRARIES = liboils_idl.la liboils_utils.la oils_cstore.la oils_qstore.la oils_rstore.la oils_pcrud.la oils_auth.la oils_auth_internal.la +lib_LTLIBRARIES = liboils_idl.la liboils_utils.la liboils_cstore.la liboils_qstore.la liboils_rstore.la liboils_pcrud.la liboils_auth.la liboils_auth_internal.la liboils_idl_la_SOURCES = oils_idl-core.c liboils_idl_la_LDFLAGS = -version-info 2:0:0 @@ -41,29 +41,29 @@ liboils_idl_la_LDFLAGS = -version-info 2:0:0 liboils_utils_la_SOURCES = oils_utils.c oils_event.c liboils_utils_la_LDFLAGS = -loils_idl -version-info 2:0:0 -oils_cstore_la_SOURCES = oils_cstore.c oils_sql.c -oils_cstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 -oils_cstore_la_DEPENDENCIES = liboils_utils.la +liboils_cstore_la_SOURCES = oils_cstore.c oils_sql.c +liboils_cstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 +liboils_cstore_la_DEPENDENCIES = liboils_utils.la -oils_qstore_la_SOURCES = oils_qstore.c oils_sql.c oils_storedq.c oils_buildq.c buildSQL.c oils_execsql.c -oils_qstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 -oils_qstore_la_DEPENDENCIES = liboils_utils.la +liboils_qstore_la_SOURCES = oils_qstore.c oils_sql.c oils_storedq.c oils_buildq.c buildSQL.c oils_execsql.c +liboils_qstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 +liboils_qstore_la_DEPENDENCIES = liboils_utils.la -oils_rstore_la_SOURCES = oils_rstore.c oils_sql.c -oils_rstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 -oils_rstore_la_DEPENDENCIES = liboils_utils.la +liboils_rstore_la_SOURCES = oils_rstore.c oils_sql.c +liboils_rstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 +liboils_rstore_la_DEPENDENCIES = liboils_utils.la -oils_pcrud_la_SOURCES = oils_pcrud.c oils_sql.c -oils_pcrud_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 -oils_pcrud_la_DEPENDENCIES = liboils_utils.la +liboils_pcrud_la_SOURCES = oils_pcrud.c oils_sql.c +liboils_pcrud_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0 +liboils_pcrud_la_DEPENDENCIES = liboils_utils.la -oils_auth_la_SOURCES = oils_auth.c -oils_auth_la_LDFLAGS = -module -loils_utils -lpcre -version-info 2:0:0 -oils_auth_la_DEPENDENCIES = liboils_utils.la +liboils_auth_la_SOURCES = oils_auth.c +liboils_auth_la_LDFLAGS = -module -loils_utils -lpcre -version-info 2:0:0 +liboils_auth_la_DEPENDENCIES = liboils_utils.la -oils_auth_internal_la_SOURCES = oils_auth_internal.c -oils_auth_internal_la_LDFLAGS = -module -loils_utils -version-info 2:0:0 -oils_auth_internal_la_DEPENDENCIES = liboils_utils.la +liboils_auth_internal_la_SOURCES = oils_auth_internal.c +liboils_auth_internal_la_LDFLAGS = -module -loils_utils -version-info 2:0:0 +liboils_auth_internal_la_DEPENDENCIES = liboils_utils.la diff --git a/docs/installation/server_installation.adoc b/docs/installation/server_installation.adoc index 59a493055c..c40f3b62d6 100644 --- a/docs/installation/server_installation.adoc +++ b/docs/installation/server_installation.adoc @@ -246,6 +246,16 @@ change the ownership on the files: chown -R opensrf:opensrf /openils ------------------------------------------------------------------------------ +Run ldconfig +------------ + +On Debian Stretch, run the following command as the root user: + +[source, bash] +------------------------------------------------------------------------------ +ldconfig +------------------------------------------------------------------------------ + Additional Instructions for Developers -------------------------------------- -- 2.11.0