summaryrefslogtreecommitdiffstats
path: root/service
diff options
context:
space:
mode:
authorShuhei AKETA <shuhei.aketa@woven-planet.global>2021-01-24 10:24:30 +0900
committerShuhei AKETA <shuhei.aketa@woven-planet.global>2021-01-24 10:24:30 +0900
commite9c50e0578cd045617f898e01cb51ec05ec7b014 (patch)
tree2de8f4a7d7e21305640830ba0d72832430eafe11 /service
parent326b7ba9dbf2762925551e7970836a2964107ec1 (diff)
Resolve libev.so conflicts
service/other/event_library/library/Makefile generates libev.so. libev.so is existing by meta-openembedded/meta-oe/recipes-connectivity/libev. Therefore, I renamed the libev.so generated by the Makefile to libbs_ev.so. Signed-off-by: Shuhei AKETA <shuhei.aketa@woven-planet.global> Change-Id: I5af26f44947ed1f0cdd170bd5dc0f9c3b2d71ad9
Diffstat (limited to 'service')
-rwxr-xr-xservice/other/event_library/library/Makefile4
-rwxr-xr-xservice/system/resource_manager/client/Makefile2
-rwxr-xr-xservice/system/resource_manager/server/Makefile2
-rwxr-xr-xservice/system/system_manager/server/Makefile2
-rwxr-xr-xservice/system/task_manager/server/Makefile2
-rwxr-xr-xservice/vehicle/positioning/server/src/nsfw/Makefile2
-rwxr-xr-xservice/vehicle/positioning_base_library/library/Makefile2
7 files changed, 8 insertions, 8 deletions
diff --git a/service/other/event_library/library/Makefile b/service/other/event_library/library/Makefile
index 3127439..90acd43 100755
--- a/service/other/event_library/library/Makefile
+++ b/service/other/event_library/library/Makefile
@@ -14,8 +14,8 @@
# limitations under the License.
#
-INST_SHLIBS = libev
-libev_SRCS := src/ev_lib.c
+INST_SHLIBS = libbs_ev
+libbs_ev_SRCS := src/ev_lib.c
VPATH = ./src ./include/$(COMPONENT_NAME)/
INST_HEADERS = ev_lib.h event_library.h
diff --git a/service/system/resource_manager/client/Makefile b/service/system/resource_manager/client/Makefile
index a2bde46..54bcbb6 100755
--- a/service/system/resource_manager/client/Makefile
+++ b/service/system/resource_manager/client/Makefile
@@ -52,7 +52,7 @@ LDFLAGS += -Wl,--no-as-needed
######### linked library (dynamic) #############
LDLIBS += -lrpc
-LDLIBS += -Wl,-Bdynamic -lev
+LDLIBS += -Wl,-Bdynamic -lbs_ev
LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
include ../../system_service.mk
diff --git a/service/system/resource_manager/server/Makefile b/service/system/resource_manager/server/Makefile
index cae9191..f4ad5f4 100755
--- a/service/system/resource_manager/server/Makefile
+++ b/service/system/resource_manager/server/Makefile
@@ -50,6 +50,6 @@ LDLIBS += -Wl,-Bdynamic -lsoc_temperature_hal
LDLIBS += -Wl,-Bdynamic -lcommon
LDLIBS += -Wl,-Bdynamic -lrpc
-LDLIBS += -Wl,-Bdynamic -lev
+LDLIBS += -Wl,-Bdynamic -lbs_ev
include ../../system_service.mk
diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile
index 9c5cf68..423ab65 100755
--- a/service/system/system_manager/server/Makefile
+++ b/service/system/system_manager/server/Makefile
@@ -94,7 +94,7 @@ LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
LDLIBS += -Wl,-Bdynamic -lPosixBasedOS001legacy
LDLIBS += -Wl,-Bdynamic -lvp
LDLIBS += -Wl,-Bdynamic -ltar -lz
-LDLIBS += -Wl,-Bdynamic -lrpc -lev
+LDLIBS += -Wl,-Bdynamic -lrpc -lbs_ev
######### add library path #############
LDFLAGS += -g -Wl,--gc-sections
diff --git a/service/system/task_manager/server/Makefile b/service/system/task_manager/server/Makefile
index 7e7bfbd..e0e1e48 100755
--- a/service/system/task_manager/server/Makefile
+++ b/service/system/task_manager/server/Makefile
@@ -56,7 +56,7 @@ LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
LDLIBS += -Wl,-Bdynamic -lresm
LDLIBS += -Wl,-Bdynamic -lcommon
LDLIBS += -Wl,-Bdynamic -lvp
-LDLIBS += -Wl,-Bdynamic -lrpc -lev
+LDLIBS += -Wl,-Bdynamic -lrpc -lbs_ev
#LDLIBS += -Wl,-Bdynamic -lDiagCodeAPI
LDLIBS += -Wl,-Bdynamic -ltskmcfg
diff --git a/service/vehicle/positioning/server/src/nsfw/Makefile b/service/vehicle/positioning/server/src/nsfw/Makefile
index 403e29f..5ea514a 100755
--- a/service/vehicle/positioning/server/src/nsfw/Makefile
+++ b/service/vehicle/positioning/server/src/nsfw/Makefile
@@ -75,7 +75,7 @@ LDLIBS += -Wl,-Bdynamic -lstdc++
LDLIBS += -Wl,-Bdynamic -lDTime_Api
LDLIBS += -Wl,-Bdynamic -lVehicle_API
LDLIBS += -Wl,-Bdynamic -lvp
-LDLIBS += -Wl,-Bdynamic -lev
+LDLIBS += -Wl,-Bdynamic -lbs_ev
LDLIBS += -Wl,-Bdynamic -lCommUSB
######### add library path #############
diff --git a/service/vehicle/positioning_base_library/library/Makefile b/service/vehicle/positioning_base_library/library/Makefile
index 9265faa..6e91489 100755
--- a/service/vehicle/positioning_base_library/library/Makefile
+++ b/service/vehicle/positioning_base_library/library/Makefile
@@ -74,7 +74,7 @@ LDLIBS += -Wl,-Bdynamic -lrt
LDLIBS += -Wl,-Bdynamic -lcommon
LDLIBS += -Wl,-Bdynamic -lstdc++
LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
-LDLIBS += -Wl,-Bdynamic -lev
+LDLIBS += -Wl,-Bdynamic -lbs_ev
######### add library path #############
LDFLAGS += -shared