From 2398c899d37acd18ba13304460d3248b3ada3e09 Mon Sep 17 00:00:00 2001 From: Riku Nomoto Date: Sat, 19 Dec 2020 20:35:59 +0900 Subject: Changed to not use SDKTARGETSYSROOT. Yocto sets the recipe-sysroot directory as the sysroot. Therefore, there is no need to define the path of the recipe-sysroot using SDKTARGETSYSROOT in the recipe. Signed-off-by: Riku Nomoto Change-Id: I9f3c7155a0f9656a916a2d6ba71371a4376b502b --- hal/boot_hal/Makefile | 6 +++--- hal/can_hal/src/Makefile | 2 +- hal/clock_hal/Makefile | 6 +++--- hal/deck_hal/Makefile | 6 +++--- hal/input_hal/Makefile | 8 ++++---- hal/nv_hal/Makefile | 6 +++--- hal/positioning_hal/Makefile | 6 +++--- hal/power_hal/Makefile | 6 +++--- hal/security_hal/Makefile | 6 +++--- hal/soc_temperature_hal/Makefile | 6 +++--- hal/usb_hal/Makefile | 6 +++--- hal/vehicle_hal/Makefile | 6 +++--- hal/video_in_hal/Makefile | 3 ++- 13 files changed, 37 insertions(+), 36 deletions(-) (limited to 'hal') diff --git a/hal/boot_hal/Makefile b/hal/boot_hal/Makefile index 03ae805..ddbb183 100755 --- a/hal/boot_hal/Makefile +++ b/hal/boot_hal/Makefile @@ -22,14 +22,14 @@ HEADER := hal_api/boot_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/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 03cdcab..73a7099 100755 --- a/hal/can_hal/src/Makefile +++ b/hal/can_hal/src/Makefile @@ -38,7 +38,7 @@ LDFLAGS += -shared LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := /usr/lib:/usr/lib/basesystem diff --git a/hal/clock_hal/Makefile b/hal/clock_hal/Makefile index 0837b18..0ad6733 100755 --- a/hal/clock_hal/Makefile +++ b/hal/clock_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/clock_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -33,7 +33,7 @@ CXXFLAGS += -DAGL_REFHW LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := diff --git a/hal/deck_hal/Makefile b/hal/deck_hal/Makefile index 7b84f44..8ed42a7 100755 --- a/hal/deck_hal/Makefile +++ b/hal/deck_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/deck_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := /usr/lib diff --git a/hal/input_hal/Makefile b/hal/input_hal/Makefile index ebbf558..8e020fc 100755 --- a/hal/input_hal/Makefile +++ b/hal/input_hal/Makefile @@ -24,9 +24,9 @@ HEADER := ./hal_api/input_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/libdrm -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -I=/usr/include/libdrm +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -36,7 +36,7 @@ CXXFLAGS += -D_USE_DRM LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem ######### linked library ######################## LIBS := -Wl,-Bdynamic -lstdc++ diff --git a/hal/nv_hal/Makefile b/hal/nv_hal/Makefile index 9e974d4..fa19e24 100755 --- a/hal/nv_hal/Makefile +++ b/hal/nv_hal/Makefile @@ -22,14 +22,14 @@ HEADER := hal_api/nv_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC ######### link options ########################## -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/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 1886055..9366766 100755 --- a/hal/positioning_hal/Makefile +++ b/hal/positioning_hal/Makefile @@ -25,8 +25,8 @@ CXXFLAGS += -I./inc/Common CXXFLAGS += -I./inc/GpsCommon CXXFLAGS += -I./inc/LineSensDrv CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### @@ -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/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := /usr/lib diff --git a/hal/power_hal/Makefile b/hal/power_hal/Makefile index db0c281..e2aa118 100755 --- a/hal/power_hal/Makefile +++ b/hal/power_hal/Makefile @@ -21,8 +21,8 @@ HEADER := hal_api/power_hal.h ######### include paths/files ################### CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -31,7 +31,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := /usr/lib/basesystem diff --git a/hal/security_hal/Makefile b/hal/security_hal/Makefile index 23f33aa..7ff287f 100755 --- a/hal/security_hal/Makefile +++ b/hal/security_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/security_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := diff --git a/hal/soc_temperature_hal/Makefile b/hal/soc_temperature_hal/Makefile index 01da538..602297e 100755 --- a/hal/soc_temperature_hal/Makefile +++ b/hal/soc_temperature_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/soc_temperature_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := diff --git a/hal/usb_hal/Makefile b/hal/usb_hal/Makefile index 192db53..9d5529d 100755 --- a/hal/usb_hal/Makefile +++ b/hal/usb_hal/Makefile @@ -22,8 +22,8 @@ HEADER := ./hal_api/usb_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := diff --git a/hal/vehicle_hal/Makefile b/hal/vehicle_hal/Makefile index 2027d4a..3d3d945 100755 --- a/hal/vehicle_hal/Makefile +++ b/hal/vehicle_hal/Makefile @@ -22,8 +22,8 @@ HEADER := hal_api/vehicle_hal.h ######### include paths/files ################### CXXFLAGS += -I./inc/ CXXFLAGS += -I./hal_api/ -CXXFLAGS += -I$(SDKTARGETSYSROOT)/usr/include/basesystem -CXXFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CXXFLAGS += -I=/usr/include/basesystem +CXXFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CXXFLAGS += -Wall -fPIC @@ -32,7 +32,7 @@ CXXFLAGS += -Wall -fPIC LDFLAGS += -shared LDFLAGS += -Wl,--no-as-needed LDFLAGS += -Wl,--no-undefined -LDFLAGS += -L$(SDKTARGETSYSROOT)/usr/lib/basesystem +LDFLAGS += -L=/usr/lib/basesystem RPATH := /usr/lib diff --git a/hal/video_in_hal/Makefile b/hal/video_in_hal/Makefile index d22e9ee..cdbdfdf 100755 --- a/hal/video_in_hal/Makefile +++ b/hal/video_in_hal/Makefile @@ -21,7 +21,8 @@ HEADER = hal_api/video_in_hal.h ######### include paths/files ################### CFLAGS += -I./hal_api/ -CFLAGS += -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_types_deprecated.h +CFLAGS += -I=/usr/include/basesystem +CFLAGS += -include agl_types_deprecated.h ######### compile options ####################### CFLAGS += -Wall -fPIC -- cgit 1.2.3-korg