The android-tools recipe has been using gold linker to create
executables. Recently OE-Core has dropped support for the gold linker,
which is now causing build errors for the android-tools recipe. Update
the build-system patch in order to stop using gold for linking.
Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
...ols-modifications-to-make-it-build-in-yoct.patch | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git
a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
index 5ce375134c54..a35428b5b488 100644
---
a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
+++
b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
@@ -89,6 +89,14 @@ index 9769b68ab793..58c9a63bd225 100644
-Iexternal/boringssl/include \
-Isystem/core/adb \
-Isystem/core/base/include \
+@@ -28,7 +27,6 @@ CPPFLAGS += \
+ LDFLAGS += \
+ -Ldebian/out/system/core \
+ -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+- -fuse-ld=gold \
+ -lbase \
+ -lcutils \
+ -lpthread \
diff --git a/debian/system/core/append2simg.mk
b/debian/system/core/append2simg.mk
index 1599bdb8..598c751d 100644
--- a/debian/system/core/append2simg.mk
@@ -114,15 +122,16 @@ index d5c9a285..a59ba1a4 100644
-Iexternal/boringssl/include \
-Iexternal/avb \
-Isystem/core/adb \
-@@ -49,7 +49,7 @@ CPPFLAGS += \
+@@ -49,8 +48,7 @@ CPPFLAGS += \
LDFLAGS += \
-Ldebian/out/system/core \
- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+- -fuse-ld=gold \
+ -Wl,-rpath='$$ORIGIN/../lib/android' \
- -fuse-ld=gold \
-lbase \
-lcutils \
+ -lpthread \
diff --git a/debian/system/core/img2simg.mk b/debian/system/core/img2simg.mk
index 11adf014..8baf5ba5 100644
--- a/debian/system/core/img2simg.mk
--
2.39.5
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#115421):
https://lists.openembedded.org/g/openembedded-devel/message/115421
Mute This Topic: https://lists.openembedded.org/mt/111117140/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
