From 97ffae8e3c3c8bd79c40c599e05ed69e42cfe24d Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Wed, 1 Feb 2017 13:17:45 +0100 Subject: [PATCH 1/4] gazsim-localization: build Gazebo plugin without SOVER Setting the SO version is not necessary for the plugins and creating the symlinks is confusing, rather than helping. Additionally, that leads to wrong provides and includes during RPM generation. Therefore, exempt Gazebo plugin from SOVER setting. --- src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile b/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile index b619a7f5e5..c7d803d370 100644 --- a/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile +++ b/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile @@ -27,6 +27,7 @@ LIBS_gazebo_libgps = gazsim_msgs OBJS_gazebo_libgps = gps.o INST_LIB_SUBDIR_gazebo_libgps = $(FFLIBSUBDIR) +NOSOVER_gazebo_libgps=1 OBJS_all = $(OBJS_gazebo_libgps) From 48b30c4fa2951451e3010948133141a4a5090818 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Wed, 1 Feb 2017 13:19:08 +0100 Subject: [PATCH 2/4] gazsim-robotino: build Gazebo plugins without SOVER Setting the SO version is not necessary for the plugins and creating the symlinks is confusing, rather than helping. Additionally, that leads to wrong provides and includes during RPM generation. Therefore, exempt Gazebo plugins from SOVER setting. --- src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile | 1 + src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile index a0e71ded7c..438dd4cfd4 100644 --- a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile +++ b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile @@ -27,6 +27,7 @@ LIBS_gazebo_libgyro = gazsim_msgs OBJS_gazebo_libgyro = gyro.o INST_LIB_SUBDIR_gazebo_libgyro = $(FFLIBSUBDIR) +NOSOVER_gazebo_libgyro=1 OBJS_all = $(OBJS_gazebo_libgyro) diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile index 95e20cb455..2524a28a58 100644 --- a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile +++ b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile @@ -27,6 +27,7 @@ LIBS_gazebo_libmotor = gazsim_msgs OBJS_gazebo_libmotor = motor.o INST_LIB_SUBDIR_gazebo_libmotor = $(FFLIBSUBDIR) +NOSOVER_gazebo_libmotor=1 OBJS_all = $(OBJS_gazebo_libmotor) From c23cfa88d5031c0b68e18a273d9fd532134eb0b2 Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Wed, 1 Feb 2017 13:26:39 +0100 Subject: [PATCH 3/4] openprs: build OpenPRS modules without SOVER Setting the SO version is not necessary for the modules and creating the symlinks is confusing, rather than helping. Additionally, that leads to wrong provides and includes during RPM generation. Therefore, exempt OpenPRS modules from SOVER setting. --- src/plugins/openprs/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/openprs/Makefile b/src/plugins/openprs/Makefile index 5135fc8263..54851b47bf 100644 --- a/src/plugins/openprs/Makefile +++ b/src/plugins/openprs/Makefile @@ -43,6 +43,10 @@ INST_LIB_SUBDIR_openprs_mod_utils = $(FFLIBSUBDIR) INST_LIB_SUBDIR_openprs_mod_time = $(FFLIBSUBDIR) INST_LIB_SUBDIR_openprs_mod_blackboard = $(FFLIBSUBDIR) INST_LIB_SUBDIR_openprs_mod_config = $(FFLIBSUBDIR) +NOSOVER_openprs_mod_utils = 1 +NOSOVER_openprs_mod_time = 1 +NOSOVER_openprs_mod_blackboard = 1 +NOSOVER_openprs_mod_config = 1 # Extra files for system-wide install, i.e., "make install" FILES_openprs_files = $(subst $(SRCDIR)/,,$(wildcard $(addprefix $(SRCDIR)/data/,*.opf *.inc))) From 440761c3ee32a03585cb517480a590023dd63f8c Mon Sep 17 00:00:00 2001 From: Tim Niemueller Date: Wed, 1 Feb 2017 13:27:17 +0100 Subject: [PATCH 4/4] openprs-agent: build OpenPRS modules without SOVER Setting the SO version is not necessary for the modules and creating the symlinks is confusing, rather than helping. Additionally, that leads to wrong provides and includes during RPM generation. Therefore, exempt OpenPRS modules from SOVER setting. --- src/plugins/openprs-agent/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/openprs-agent/Makefile b/src/plugins/openprs-agent/Makefile index ca0998452c..e51dfe702b 100644 --- a/src/plugins/openprs-agent/Makefile +++ b/src/plugins/openprs-agent/Makefile @@ -37,6 +37,9 @@ OBJS_all = $(OBJS_openprs_agent) $(OBJS_openprs_mod_skiller) \ INST_LIB_SUBDIR_openprs_mod_skiller = $(FFLIBSUBDIR) INST_LIB_SUBDIR_openprs_mod_protobuf = $(FFLIBSUBDIR) INST_LIB_SUBDIR_openprs_mod_navgraph = $(FFLIBSUBDIR) +NOSOVER_openprs_mod_skiller = 1 +NOSOVER_openprs_mod_protobuf = 1 +NOSOVER_openprs_mod_navgraph = 1 # Extra files for system-wide install, i.e., "make install" FILES_openprs_files = $(subst $(SRCDIR)/,,$(wildcard $(addprefix $(SRCDIR)/data/,*.opf *.inc *.sym)))