From f375d527c775582f4229a94d96177f18d80f0008 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> Date: Sun, 22 Nov 2020 07:31:12 +0900 Subject: Fix the path to the directory for the libraries Fix the path to the directory of the libraries, '/usr/agl/lib' to follow the standard, '/usr/lib' and add subsystem name 'basesystem' for agl-basesystem. Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> Change-Id: I353cfe3017967ae25348ce10460e453a96d6424e --- hal/boot_hal/Makefile | 2 +- hal/can_hal/src/Makefile | 4 ++-- hal/clock_hal/Makefile | 2 +- hal/deck_hal/Makefile | 2 +- hal/input_hal/Makefile | 2 +- hal/nv_hal/Makefile | 2 +- hal/positioning_hal/Makefile | 2 +- hal/power_hal/Makefile | 4 ++-- hal/security_hal/Makefile | 2 +- hal/soc_temperature_hal/Makefile | 2 +- hal/usb_hal/Makefile | 2 +- hal/vehicle_hal/Makefile | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) (limited to 'hal') diff --git a/hal/boot_hal/Makefile b/hal/boot_hal/Makefile index a5b09fb..d5af569 100755 --- a/hal/boot_hal/Makefile +++ b/hal/boot_hal/Makefile @@ -29,7 +29,7 @@ CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsolu CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined diff --git a/hal/can_hal/src/Makefile b/hal/can_hal/src/Makefile index f34eb75..03cdcab 100755 --- a/hal/can_hal/src/Makefile +++ b/hal/can_hal/src/Makefile @@ -38,9 +38,9 @@ LDFLAGS += -shared LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem -RPATH := /usr/lib:/usr/agl/lib +RPATH := /usr/lib:/usr/lib/basesystem ######### linked library ######################## LDLIBS += -Wl,-Bdynamic -lstdc++ diff --git a/hal/clock_hal/Makefile b/hal/clock_hal/Makefile index cec7813..a98cb3c 100755 --- a/hal/clock_hal/Makefile +++ b/hal/clock_hal/Makefile @@ -33,7 +33,7 @@ CXXFLAGS += -DAGL_REFHW LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem RPATH := diff --git a/hal/deck_hal/Makefile b/hal/deck_hal/Makefile index 340571a..0d66a46 100755 --- a/hal/deck_hal/Makefile +++ b/hal/deck_hal/Makefile @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem RPATH := /usr/lib diff --git a/hal/input_hal/Makefile b/hal/input_hal/Makefile index bfa5c2c..d03b12d 100755 --- a/hal/input_hal/Makefile +++ b/hal/input_hal/Makefile @@ -36,7 +36,7 @@ CXXFLAGS += -D_USE_DRM LDFLAGS := -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem ######### linked library ######################## LIBS := -Wl,-Bdynamic -lstdc++ diff --git a/hal/nv_hal/Makefile b/hal/nv_hal/Makefile index a6c2ee8..7109505 100755 --- a/hal/nv_hal/Makefile +++ b/hal/nv_hal/Makefile @@ -29,7 +29,7 @@ CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_obsolu CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined diff --git a/hal/positioning_hal/Makefile b/hal/positioning_hal/Makefile index d0d0a69..5e90c7a 100755 --- a/hal/positioning_hal/Makefile +++ b/hal/positioning_hal/Makefile @@ -37,7 +37,7 @@ CXXFLAGS += -DLINUX -D__CWORD71__VEHICLE_ -D__CWORD71_ LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem RPATH := /usr/lib diff --git a/hal/power_hal/Makefile b/hal/power_hal/Makefile index ba5f3ab..f717d70 100755 --- a/hal/power_hal/Makefile +++ b/hal/power_hal/Makefile @@ -31,9 +31,9 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem -RPATH := /usr/agl/lib +RPATH := /usr/lib/basesystem ######### linked library ######################## LIBS += -Wl,-Bdynamic -lstdc++ diff --git a/hal/security_hal/Makefile b/hal/security_hal/Makefile index 7658c0f..75a1ff0 100755 --- a/hal/security_hal/Makefile +++ b/hal/security_hal/Makefile @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem RPATH := diff --git a/hal/soc_temperature_hal/Makefile b/hal/soc_temperature_hal/Makefile index 62ce12d..12b2fa5 100755 --- a/hal/soc_temperature_hal/Makefile +++ b/hal/soc_temperature_hal/Makefile @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem RPATH := diff --git a/hal/usb_hal/Makefile b/hal/usb_hal/Makefile index be2b796..c1f8338 100755 --- a/hal/usb_hal/Makefile +++ b/hal/usb_hal/Makefile @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem RPATH := diff --git a/hal/vehicle_hal/Makefile b/hal/vehicle_hal/Makefile index 2bed2e2..8bf8a66 100755 --- a/hal/vehicle_hal/Makefile +++ b/hal/vehicle_hal/Makefile @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/agl/lib +LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem RPATH := /usr/lib -- cgit