diff options
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/core/0013-patching-libziparchive.mk-to-build-in-yocto-environm.patch')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/core/0013-patching-libziparchive.mk-to-build-in-yocto-environm.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0013-patching-libziparchive.mk-to-build-in-yocto-environm.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0013-patching-libziparchive.mk-to-build-in-yocto-environm.patch deleted file mode 100644 index b49ec3b..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/core/0013-patching-libziparchive.mk-to-build-in-yocto-environm.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From ae2bf1925fe02ea040005df27842c77c6d02b051 Mon Sep 17 00:00:00 2001 | ||
2 | From: Etienne Cordonnier <ecordonnier@snap.com> | ||
3 | Date: Fri, 3 Mar 2023 13:39:24 +0100 | ||
4 | Subject: [PATCH 13/15] patching libziparchive.mk to build in yocto | ||
5 | environment. | ||
6 | |||
7 | Changes include: | ||
8 | Introduced an output folder which will keep all the outputs from the | ||
9 | android-tools. | ||
10 | |||
11 | Adding an include file that is setting the common flags. | ||
12 | Changed the cppflag to include the headers from other components | ||
13 | of android-tools | ||
14 | |||
15 | Modified LDflags so that the libraries that are coming from other android-tools | ||
16 | are searched in the output folder. | ||
17 | |||
18 | Modified the build rule so that it outputs the binary to the OUT_DIR | ||
19 | |||
20 | Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> | ||
21 | |||
22 | Upstream-Status: Pending | ||
23 | --- | ||
24 | debian/libziparchive.mk | 12 +++++++----- | ||
25 | 1 file changed, 7 insertions(+), 5 deletions(-) | ||
26 | |||
27 | diff --git a/debian/libziparchive.mk b/debian/libziparchive.mk | ||
28 | index 803ea58e..6a697059 100644 | ||
29 | --- a/debian/libziparchive.mk | ||
30 | +++ b/debian/libziparchive.mk | ||
31 | @@ -1,3 +1,4 @@ | ||
32 | +include ../../rules_yocto.mk | ||
33 | NAME = libziparchive | ||
34 | SOURCES = zip_archive.cc \ | ||
35 | zip_archive_stream_entry.cc\ | ||
36 | @@ -5,14 +6,15 @@ SOURCES = zip_archive.cc \ | ||
37 | SOURCES := $(foreach source, $(SOURCES), libziparchive/$(source)) | ||
38 | CXXFLAGS += -std=gnu++17 | ||
39 | CPPFLAGS += -DZLIB_CONST -D_FILE_OFFSET_BITS=64 \ | ||
40 | - -Iinclude -Ibase/include -Ilibziparchive/include | ||
41 | + -Iinclude -Ibase/include -Ilibziparchive/include -I$(OUT_DIR)/usr/include/ | ||
42 | LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \ | ||
43 | -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ | ||
44 | - -lz -L. -llog -lbase | ||
45 | + -lz -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android -llog -lbase | ||
46 | |||
47 | build: $(SOURCES) | ||
48 | - $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) | ||
49 | - ln -s $(NAME).so.0 $(NAME).so | ||
50 | + $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) | ||
51 | + ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so | ||
52 | + cp -r libziparchive/include/* $(OUT_DIR)/usr/include/ | ||
53 | |||
54 | clean: | ||
55 | - $(RM) $(NAME).so* | ||
56 | + $(RM) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so* | ||
57 | -- | ||
58 | 2.36.1.vfs.0.0 | ||
59 | |||