summaryrefslogtreecommitdiffstats
path: root/hal
diff options
context:
space:
mode:
authorShuhei AKETA <shuhei.aketa@woven-planet.global>2021-01-16 14:16:50 +0900
committerShuhei AKETA <shuhei.aketa@woven-planet.global>2021-01-18 18:04:04 +0900
commit326b7ba9dbf2762925551e7970836a2964107ec1 (patch)
tree99985056f7d6a519bc691b24fbb5a16d54691739 /hal
parent7bc3ffa5e56fe2d87747adbffa5e2ab09e64fb32 (diff)
Changed the installation path of libraries
The libraries required by basesystem were deployed in /usr/lib/basesystem. However, if the libraries were installed in this path, the executable would not link the libraries. I changed the path of the librariesfrom /usr/lib/basesystem to /usr/lib. Signed-off-by: Shuhei AKETA <shuhei.aketa@woven-planet.global> Change-Id: I174b29e96e1da9001f8c5308025abaaaeddc6342
Diffstat (limited to 'hal')
-rwxr-xr-xhal/boot_hal/Makefile5
-rwxr-xr-xhal/can_hal/src/Makefile3
-rwxr-xr-xhal/clock_hal/Makefile5
-rwxr-xr-xhal/deck_hal/Makefile5
-rwxr-xr-xhal/input_hal/Makefile1
-rwxr-xr-xhal/nv_hal/Makefile5
-rwxr-xr-xhal/positioning_hal/Makefile5
-rwxr-xr-xhal/power_hal/Makefile5
-rwxr-xr-xhal/security_hal/Makefile5
-rwxr-xr-xhal/soc_temperature_hal/Makefile5
-rwxr-xr-xhal/usb_hal/Makefile5
-rwxr-xr-xhal/vehicle_hal/Makefile5
-rwxr-xr-xhal/video_in_hal/Makefile2
13 files changed, 11 insertions, 45 deletions
diff --git a/hal/boot_hal/Makefile b/hal/boot_hal/Makefile
index ddbb183..26070ad 100755
--- a/hal/boot_hal/Makefile
+++ b/hal/boot_hal/Makefile
@@ -29,13 +29,10 @@ CXXFLAGS += -include agl_types_deprecated.h
CXXFLAGS += -Wall -fPIC
######### link options ##########################
-LDFLAGS += -L=/usr/lib/basesystem
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-RPATH :=
-
######### linked library ########################
LIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
@@ -48,7 +45,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/can_hal/src/Makefile b/hal/can_hal/src/Makefile
index 73a7099..1af9874 100755
--- a/hal/can_hal/src/Makefile
+++ b/hal/can_hal/src/Makefile
@@ -38,9 +38,6 @@ LDFLAGS += -shared
LDFLAGS += -Wl,--gc-sections
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-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 0ad6733..33846c0 100755
--- a/hal/clock_hal/Makefile
+++ b/hal/clock_hal/Makefile
@@ -33,9 +33,6 @@ CXXFLAGS += -DAGL_REFHW
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH :=
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -50,7 +47,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/deck_hal/Makefile b/hal/deck_hal/Makefile
index 8ed42a7..4e8cd27 100755
--- a/hal/deck_hal/Makefile
+++ b/hal/deck_hal/Makefile
@@ -32,9 +32,6 @@ CXXFLAGS += -Wall -fPIC
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH := /usr/lib
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -50,7 +47,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=:$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/input_hal/Makefile b/hal/input_hal/Makefile
index 8e020fc..9d034db 100755
--- a/hal/input_hal/Makefile
+++ b/hal/input_hal/Makefile
@@ -36,7 +36,6 @@ CXXFLAGS += -D_USE_DRM
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
######### linked library ########################
LIBS := -Wl,-Bdynamic -lstdc++
diff --git a/hal/nv_hal/Makefile b/hal/nv_hal/Makefile
index fa19e24..e05333f 100755
--- a/hal/nv_hal/Makefile
+++ b/hal/nv_hal/Makefile
@@ -29,13 +29,10 @@ CXXFLAGS += -include agl_types_deprecated.h
CXXFLAGS += -Wall -fPIC
######### link options ##########################
-LDFLAGS += -L=/usr/lib/basesystem
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-RPATH :=
-
######### linked library ########################
LIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
@@ -48,7 +45,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/positioning_hal/Makefile b/hal/positioning_hal/Makefile
index 9366766..90ff314 100755
--- a/hal/positioning_hal/Makefile
+++ b/hal/positioning_hal/Makefile
@@ -37,9 +37,6 @@ CXXFLAGS += -DLINUX -D__CWORD71__VEHICLE_ -D__CWORD71_
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH := /usr/lib
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -72,7 +69,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=:$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/power_hal/Makefile b/hal/power_hal/Makefile
index e2aa118..c5cf661 100755
--- a/hal/power_hal/Makefile
+++ b/hal/power_hal/Makefile
@@ -31,9 +31,6 @@ CXXFLAGS += -Wall -fPIC
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH := /usr/lib/basesystem
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -48,7 +45,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/security_hal/Makefile b/hal/security_hal/Makefile
index 7ff287f..7d6e5e5 100755
--- a/hal/security_hal/Makefile
+++ b/hal/security_hal/Makefile
@@ -32,9 +32,6 @@ CXXFLAGS += -Wall -fPIC
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH :=
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -49,7 +46,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/soc_temperature_hal/Makefile b/hal/soc_temperature_hal/Makefile
index 602297e..f333599 100755
--- a/hal/soc_temperature_hal/Makefile
+++ b/hal/soc_temperature_hal/Makefile
@@ -32,9 +32,6 @@ CXXFLAGS += -Wall -fPIC
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH :=
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -49,7 +46,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/usb_hal/Makefile b/hal/usb_hal/Makefile
index 9d5529d..ae182ec 100755
--- a/hal/usb_hal/Makefile
+++ b/hal/usb_hal/Makefile
@@ -32,9 +32,6 @@ CXXFLAGS += -Wall -fPIC
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH :=
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -49,7 +46,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/vehicle_hal/Makefile b/hal/vehicle_hal/Makefile
index 3d3d945..8f5708d 100755
--- a/hal/vehicle_hal/Makefile
+++ b/hal/vehicle_hal/Makefile
@@ -32,9 +32,6 @@ CXXFLAGS += -Wall -fPIC
LDFLAGS += -shared
LDFLAGS += -Wl,--no-as-needed
LDFLAGS += -Wl,--no-undefined
-LDFLAGS += -L=/usr/lib/basesystem
-
-RPATH := /usr/lib
######### linked library ########################
LIBS += -Wl,-Bdynamic -lstdc++
@@ -51,7 +48,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=:$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################
diff --git a/hal/video_in_hal/Makefile b/hal/video_in_hal/Makefile
index cdbdfdf..9ad16ce 100755
--- a/hal/video_in_hal/Makefile
+++ b/hal/video_in_hal/Makefile
@@ -45,7 +45,7 @@ all: $(TARGET)
@echo $@ done.
$(TARGET): $(OBJS)
- $(CC) $(LDFLAGS) -Wl,-rpath=$(RPATH) $(OBJS) $(LIBS) -o $(TARGET)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $(TARGET)
@echo $@ done.
######### make cleans ###########################