From 3a913371009be293dd496d6e630b9ea26eac462b Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Thu, 29 Jan 2026 23:04:39 +0900 Subject: [PATCH] Rename libpcp to libpgpoolpcp to avoid conflict with RHEL PCP library. The libpcp.so library provided by Pgpool-II conflicts with libpcp.so shipped by RHEL. To avoid this conflict, the Pgpool-II libpcp library has been renamed to libpgpoolpcp. --- src/libs/pcp/Makefile.am | 10 +++++----- src/pgpool.spec | 6 +++--- src/sql/pgpool_adm/Makefile | 2 +- src/tools/pcp/Makefile.am | 30 +++++++++++++++--------------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/libs/pcp/Makefile.am b/src/libs/pcp/Makefile.am index 31f51233a..cfab51be4 100644 --- a/src/libs/pcp/Makefile.am +++ b/src/libs/pcp/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@ -lib_LTLIBRARIES = libpcp.la -libpcp_la_LDFLAGS = -version-info 3:0:0 -dist_libpcp_la_SOURCES = pcp.c \ +lib_LTLIBRARIES = libpgpoolpcp.la +libpgpoolpcp_la_LDFLAGS = -version-info 3:0:0 +dist_libpgpoolpcp_la_SOURCES = pcp.c \ ../../utils/pool_path.c \ ../../tools/fe_port.c \ ../../tools/fe_memutils.c \ @@ -10,7 +10,7 @@ dist_libpcp_la_SOURCES = pcp.c \ ../../utils/pool_health_check_stats.c \ ../../utils/sprompt.c -nodist_libpcp_la_SOURCES = pcp_stream.c \ +nodist_libpgpoolpcp_la_SOURCES = pcp_stream.c \ md5.c \ json.c @@ -27,4 +27,4 @@ json.c: ../../../src/utils/json.c rm -f $@ && ln -s $< . clean-local: - -rm -f $(nodist_libpcp_la_SOURCES) + -rm -f $(nodist_libpgpoolpcp_la_SOURCES) diff --git a/src/pgpool.spec b/src/pgpool.spec index c93eb37a3..23ba85e28 100644 --- a/src/pgpool.spec +++ b/src/pgpool.spec @@ -194,7 +194,7 @@ install -d %{buildroot}%{_sysconfdir}/sudoers.d install -m 0440 %{SOURCE6} %{buildroot}%{_sysconfdir}/sudoers.d/pgpool # nuke libtool archive and static lib -rm -f %{buildroot}%{_libdir}/libpcp.{a,la} +rm -f %{buildroot}%{_libdir}/libpgpoolpcp.{a,la} mkdir html mv doc/src/sgml/html html/en @@ -284,7 +284,7 @@ fi %{_mandir}/man1/*.1.gz %{_datadir}/%{short_name}/insert_lock.sql %{_datadir}/%{short_name}/pgpool.pam -%{_libdir}/libpcp.so.* +%{_libdir}/libpgpoolpcp.so.* %if %{systemd_enabled} %attr(755,postgres,postgres) %dir %{_varrundir} %{_tmpfilesdir}/%{name}.conf @@ -320,7 +320,7 @@ fi %{_includedir}/pcp.h %{_includedir}/pool_process_reporting.h %{_includedir}/pool_type.h -%{_libdir}/libpcp.so +%{_libdir}/libpgpoolpcp.so %files extensions %defattr(-,root,root,-) diff --git a/src/sql/pgpool_adm/Makefile b/src/sql/pgpool_adm/Makefile index ce996da8d..cff8f0300 100644 --- a/src/sql/pgpool_adm/Makefile +++ b/src/sql/pgpool_adm/Makefile @@ -10,7 +10,7 @@ pgpool_adm--1.0--1.1.sql pgpool_adm--1.1--1.2.sql pgpool_adm--1.2--1.3.sql \ pgpool_adm--1.4.sql pgpool_adm--1.3--1.4.sql \ pgpool_adm--1.5.sql pgpool_adm--1.4--1.5.sql \ pgpool_adm--1.6.sql pgpool_adm--1.5--1.6.sql -SHLIB_LINK = -L../../libs/pcp/.libs -lpcp +SHLIB_LINK = -L../../libs/pcp/.libs -lpgpoolpcp # if you are using PostgreSQL 8.0 or later, # using pg_config is recommended. # if you are not, comment out following line and... diff --git a/src/tools/pcp/Makefile.am b/src/tools/pcp/Makefile.am index 3f82234b0..f6d0622b3 100644 --- a/src/tools/pcp/Makefile.am +++ b/src/tools/pcp/Makefile.am @@ -20,32 +20,32 @@ bin_PROGRAMS = pcp_stop_pgpool \ client_sources = pcp_frontend_client.c ../fe_memutils.c ../../utils/sprompt.c ../../utils/pool_path.c pcp_stop_pgpool_SOURCES = $(client_sources) -pcp_stop_pgpool_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_stop_pgpool_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_node_count_SOURCES = $(client_sources) -pcp_node_count_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_node_count_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_node_info_SOURCES = $(client_sources) -pcp_health_check_stats_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_health_check_stats_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_health_check_stats_SOURCES = $(client_sources) ../../utils/pool_health_check_stats.c -pcp_node_info_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_node_info_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_proc_count_SOURCES = $(client_sources) -pcp_proc_count_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_proc_count_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_proc_info_SOURCES = $(client_sources) -pcp_proc_info_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_proc_info_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_detach_node_SOURCES = $(client_sources) -pcp_detach_node_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_detach_node_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_attach_node_SOURCES = $(client_sources) -pcp_attach_node_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_attach_node_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_recovery_node_SOURCES = $(client_sources) -pcp_recovery_node_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_recovery_node_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_pool_status_SOURCES = $(client_sources) -pcp_pool_status_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_pool_status_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_promote_node_SOURCES = $(client_sources) -pcp_promote_node_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_promote_node_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_watchdog_info_SOURCES = $(client_sources) -pcp_watchdog_info_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_watchdog_info_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_reload_config_SOURCES = $(client_sources) -pcp_reload_config_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_reload_config_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_log_rotate_SOURCES = $(client_sources) -pcp_log_rotate_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_log_rotate_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la pcp_invalidate_query_cache_SOURCES = $(client_sources) -pcp_invalidate_query_cache_LDADD = $(libs_dir)/pcp/libpcp.la +pcp_invalidate_query_cache_LDADD = $(libs_dir)/pcp/libpgpoolpcp.la -- 2.39.5