diff options
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/core/0006-libbase.mk-modifications-to-make-it-build-in-yocto-e.patch')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/core/0006-libbase.mk-modifications-to-make-it-build-in-yocto-e.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0006-libbase.mk-modifications-to-make-it-build-in-yocto-e.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0006-libbase.mk-modifications-to-make-it-build-in-yocto-e.patch deleted file mode 100644 index 6211f04..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/core/0006-libbase.mk-modifications-to-make-it-build-in-yocto-e.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 22c7140dc170ecb26bde33fed4c9249b164f8d3c Mon Sep 17 00:00:00 2001 | ||
2 | From: Etienne Cordonnier <ecordonnier@snap.com> | ||
3 | Date: Fri, 3 Mar 2023 13:19:08 +0100 | ||
4 | Subject: [PATCH 06/15] libbase.mk: modifications to make it build in yocto | ||
5 | environment | ||
6 | |||
7 | Adding an include file that is setting the common flags. | ||
8 | Changed the cppflag to include the headers from other components | ||
9 | of android-tools | ||
10 | |||
11 | Modified LDflags so that the libraries that are coming from other android-tools | ||
12 | are searched in the output folder. | ||
13 | |||
14 | Modified the build rule so that it outputs the binary to the OUT_DIR | ||
15 | |||
16 | Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> | ||
17 | --- | ||
18 | debian/libbase.mk | 8 +++++--- | ||
19 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/debian/libbase.mk b/debian/libbase.mk | ||
22 | index 80da48f3..e6c3e365 100644 | ||
23 | --- a/debian/libbase.mk | ||
24 | +++ b/debian/libbase.mk | ||
25 | @@ -1,3 +1,4 @@ | ||
26 | +include ../../rules_yocto.mk | ||
27 | NAME = libbase | ||
28 | SOURCES = \ | ||
29 | chrono_utils.cpp \ | ||
30 | @@ -20,8 +21,9 @@ CPPFLAGS += -Iinclude -Ibase/include | ||
31 | LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 | ||
32 | |||
33 | build: $(SOURCES) | ||
34 | - $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) | ||
35 | - ln -s $(NAME).so.0 $(NAME).so | ||
36 | + $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) | ||
37 | + ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so | ||
38 | + cp -r base/include/* $(OUT_DIR)/usr/include/ | ||
39 | |||
40 | clean: | ||
41 | - $(RM) $(NAME).so* | ||
42 | + $(RM) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so* | ||
43 | -- | ||
44 | 2.36.1.vfs.0.0 | ||
45 | |||